gentoo resync : 02.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 23:54:25 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 23:54:25 +0000
commit: f443475c824b4b5c086e6d040961cb35ad81bc60 (patch)
tree: 6a6b4078e5565d11ab153a37a39af2d57becea34
parent: 407525b571b48cfd65e1ad7a02d250a927c967c9 (diff)
850 files changed, 3556 insertions, 2284 deletions
diff --git a/Manifest b/Manifest
index 113b1324529e..6d9de113b14b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28841 BLAKE2B 9eabff9483abd5ef868238586e0d55b3efd3846b2561ecdd35bbc7ea5477343f1db868bad148167ee7475cc7c5aaa520a8d808dc024b5e91a1e44d916900c81b SHA512 5a8511b6faea0f1c89da9d505161b9010b83352f1580684c7428cc44ff3f045b5cc35caecf3c0f17092a9d818b99b8675d8378734b40594b2152cd811c58fe84
-TIMESTAMP 2017-12-01T02:08:29Z
+MANIFEST Manifest.files.gz 28831 BLAKE2B 120ee2590ff07112eb37315233135be3c98e3030aeee78b37db4bf73cb25e757d307e974c22054813443e1117dcfc5230c4d426c0c0edccf011ba1dd4cda74db SHA512 d7495aa1a4f0f7eaa8454bb6175e0570f2338a0a89ec0a140ef3b18afc02f9e9555a25de72f2f7618e0ec7b1c5bb2603b80ee2bc0e6b283fde2664bc98c3dff6
+TIMESTAMP 2017-12-01T23:08:36Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloguZ1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloh4PRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlxg//ddyhziN0YQQfom4oLhGxn+khNYeHfq10upT3Pg2KL0Rd+6ide52XIB0E
-sv1GPITJCU2DfqeEFvCrKH/tO1z4Uy/XfbYWyNXU3UvNcmWdCnJPTg7VJJjhiIeP
-CxGGszHZaqAwWgfndlgquCM9AtSotUTTyZGleIGP0s5rtGRivZq0aVKMH3wgZGfR
-FYaIss6wI4C4hIGg4yLEDNz0QXxa41AsDX9OiXGgPY77UyzAhtXEYVhQaZbBQuTs
-cwSLrVX1TeCcWoXrU5mEJiEFLG6o4rGOVGpaRdu8sXFKH9LKCQ36deBsVYeRni27
-8zyaMXvqZsPwuYjNQo0FqFjTPhiLkPg/+LMtNo+fLT3R+VoXHXlMCpEryj0sTQME
-zVb+CbWEy0RohW5Kbki3TYCad4RK+o3Muf3UNS0N3ITu7DoD8kAA/15ENBKV0TVw
-yaXlsEZhj4Y/X9fgN52+FjA+2aEgL/k4eiAeUEE8q6CT2x5LK1SWp2hg/B/3TJxr
-BkstwaOdjKwaXW3MAW3nFvDbTEEpdX73NEq73FP0UjGUMiJvUHwPUBwkRiSoWvrL
-Q5XqR/EinuLxHuZByhDvBM1rgdM1+qt3XP35lxSIZHW8ShARI9lCYXHjOktIQPRQ
-ZNwzmb66Fyy1dnxRyJ1oI88Cd4tTdziIf0rSYu9j8SesYWscoOo=
-=j2l8
+klDdDhAApQiQy/Az1mIqNDntePA5oTOcPpxTMaTUQrNTCsuCgoHmXsIYTpMuyfZy
+GHpwbKhU20jUEFPAHJWs2OkyYXYf+feKxhdawJIOeMJ3gw4uigLZcI+7CFLREsGX
+8HQBrleffsKfNErUADf3VNv2kHDj1/DcieEDk+rehVjaDWdRs5Lo5gr5Lc6ZHvkT
+ji7I5h+F5fy1owi91uoL6uehph6AkD3Y7ScO2G06STsVBa9AFTIOsxutsVDwJZtT
+6A/bs1exe8L8CYTAM0RwNWH3ORhQQGmw43nAC2i8gr6VrEcWUVXDXuLwuf+mGn2+
+kjxls+5pq+BafINz94xt5m4lO//xS5PVLd4aWyxORyNx7RFXpcnXe2CSBifqcS6q
+SWGqH6UJ11XLroaPTx+QphGdIzgoVQ9oif47yTVsgEoJRo+YH+occ0LETfl35fMJ
+4mhBPpxuolx4AksldUWiLngg52NT3AV2g24oijUp1KLxund0V7ILj71koE23k1l/
+dlY65l5fLvCaUhJVl0wAJybnxdoQkWnv+7Qs2ZV5H1kMmMmYgruQwAoUmB7V5cBs
+1DMAJMZAUyq4+oedyl6cc/XOrxJivqvt6eUP3yj8Ix4VNK0CE6/9nwj5X99ANwmr
+mkGTabM3ZPZ+84p0bmojAsas/Lua3ME5TVbUdvmb91SlV5V8lTI=
+=gNL3
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 41f0837b0573..ff18988d7d62 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 284ebb6b726b..7cc21a823f15 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 62fade5d5352..4f5d417278ba 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,7 +1,9 @@
 DIST dxf-6.2.0.tar.gz 284243 SHA256 c3c927dd3c397683707ade3a909bb41e887d9a0b07f7f6efdd69c7b0f4793218 SHA512 b3498e6a05401be784aeb086be3db21199bc6f0fc206bbb31344b29b84289f56dc4001020597f77b6867dff9d5b14f6ab41c921df5dabc094520af5dd6fdea0b WHIRLPOOL f4a9a8981dc1abe2d12ad4fe48de1ec6d86ef2d4cb93c110ece9c9127c10dc79986237b340f14983080aea0fbea61e422555e18864966bb57830ddb27c8d7ca8
 DIST dxf-6.3.0.tar.gz 292165 SHA256 df183e9a3661b0e264438c7b27d830cf6920bc343dc2e1fc84aa1d1a141aed01 SHA512 6c4273d0c1cecb2094722b4fff0d883bb26a6c5f976ae046cb8856685b9122af7e0a192f7e31c4786b6fa07a30666602790da4bf13d08dca84d9937e3d81f657 WHIRLPOOL c2b2590d1975e1ac32b8f71e3c895e75e207dc11d0535692d84d8db23246a8f50685b6f17618bcdd5c7e3dfd2d22790d89e9ebf5c74b17ace0e7a399086b31cc
-DIST dxf-7.0.0.tar.gz 292703 SHA256 25cc1d5c01e4680e1955057667dbbd8494eb004e7d27dfb5b56d1d817d61a4bd SHA512 659b51f28ee6c365b57888e87e29e5500d8b3544efecb0b2257903a1e17e41722adc052d35c2ab1dbf87365d4734d1c2d57c16e31677451cf44fd23e6d9accc8 WHIRLPOOL 3a3371fd5dccfa397d8ca90c71b0588fa86470d7013bd46f0d19f2357a41a0c62c63a988bab90d37ad21e75b648b4be3cfe20f83999bf2abadbce2357d2591f8
+DIST dxf-7.0.0.tar.gz 292703 BLAKE2B 9abd7610a66aa5da6ddac86e3ced92b3040ffff238547a8a70e0745d13df1d70ad96c8954a6a784f19b52c01e11d650539bb5e967ef72288dbde3a58fb3b83a9 SHA512 659b51f28ee6c365b57888e87e29e5500d8b3544efecb0b2257903a1e17e41722adc052d35c2ab1dbf87365d4734d1c2d57c16e31677451cf44fd23e6d9accc8
+DIST dxf-7.0.1.tar.gz 292883 BLAKE2B 9723866611ea93b86196d13250eb0a435c8a92541f7ad95a432724a056153af8f9bff5498d6a564c7e98f3cffee0ef6dc605b90c3d4e9ddcc2f8d12ff9276cf7 SHA512 01b5b9d77fc59cf552c94b778700af219302d795ce07399d45fb51d98e72ba6d03cc473ac6f6641a9562d6a196d4d72f44b963ac9e210863f76b3a6ab7a9628e
 EBUILD dxf-6.2.0.ebuild 728 BLAKE2B f4a9e0e40e2f37576a11c48348419ce9aa242d231051c97b9fc44b53d09a3ee5b71f371395242ece1464b2e92da62fcc26be4f744da091814ed80a488458f14b SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867
 EBUILD dxf-6.3.0.ebuild 728 BLAKE2B f4a9e0e40e2f37576a11c48348419ce9aa242d231051c97b9fc44b53d09a3ee5b71f371395242ece1464b2e92da62fcc26be4f744da091814ed80a488458f14b SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867
 EBUILD dxf-7.0.0.ebuild 728 BLAKE2B f4a9e0e40e2f37576a11c48348419ce9aa242d231051c97b9fc44b53d09a3ee5b71f371395242ece1464b2e92da62fcc26be4f744da091814ed80a488458f14b SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867
+EBUILD dxf-7.0.1.ebuild 728 BLAKE2B f4a9e0e40e2f37576a11c48348419ce9aa242d231051c97b9fc44b53d09a3ee5b71f371395242ece1464b2e92da62fcc26be4f744da091814ed80a488458f14b SHA512 41d2a28c394598f1fc78f1e335cf73e676ce55ab3fa95dcdfc67035206f5d47fdf7ff45421e969aa214d8a50fb7f850be92fa03df122e4f4c1d6b92675aad867
 MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.0.1.ebuild b/app-admin/dxf/dxf-7.0.1.ebuild
new file mode 100644
index 000000000000..4c3842e34cc1
--- /dev/null
+++ b/app-admin/dxf/dxf-7.0.1.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/helm/Manifest b/app-admin/helm/Manifest
new file mode 100644
index 000000000000..da7d3da628ab
--- /dev/null
+++ b/app-admin/helm/Manifest
@@ -0,0 +1,91 @@
+DIST github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz 84538 BLAKE2B 0b97625db8735a99fbb8b125dd275026bbb913617a55e225dd79118d480b8163db6f309de92e23f88cad886d84c1bc34072305036f5656a31f9e98d494c0f73c SHA512 05ce1eff741673e6c50beece51a4974ad375cfc78eb493f9dea9a8b0f5d23ff30a5a21824d8e42e49993eab267ca5fca2264473dfae2f2c65f990ce7a663c536
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
+DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
+DIST github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz 35366 BLAKE2B ddde73c2c0a6fa6f80ac9a135bae99030b72b94cebe6efa3e42c1a4792f344d31d7d76309004b533c9687d4729a68bb19f3b39d179e2e41d7ad4d55356a9fcab SHA512 daf9dc30aab277192244af9f207b31e772457c5d9600f69b30780b2f267f4f45ee778136d6f8e27b41a47593623a4b21a2af960678e1a8f2ec6aa16cc7060275
+DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
+DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
+DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
+DIST github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz 13236 BLAKE2B 2d3e63d314dce19c07f056fc2691595e0509819c244393964a4f792fc6b0512dc9989cb147aa6c174504034d30548cadddc6f42c0d0001e46153c35f394335c7 SHA512 1276f5284433e748b870215c11422cc632fca84d3d05466374516ecaea135e9595240a93d5b2e2e9bb4846ef3c2523452a876d369f0c7316a3e1a7b2a0370e41
+DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
+DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
+DIST github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz 812639 BLAKE2B a3cb2d79cdbf31ec9bc965299af47f000bbc984b0d403d2ceb47a5f7d321c11e919945748e644b9259678dcfda283a0188c2c4b5b6591cb3c10e9c9b422336db SHA512 0a9be08cc5ef1662deb3d4df226401b5aaeb3fb2905af3ce2b47f81c4fab22f0bc68a8ea3eb98a5f5b42dabd0c97bf3e96f8516a9c6d730fbf3c90a02cac1aaf
+DIST github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz 3393 BLAKE2B a63a65e8dac54a2220aed0c23024b0c2897c72f172f55c9ba319cd913bfd3f8be87935735e1b42c96f6f7abedde09c84b5eea4adc1fca0b13c018276d52eb04a SHA512 b6e5eb124d073a22e6177b80dfadc835baae69ea88061d761b0ccdbe28f43614d74ce11025fbe8b8d9fd63107606e411b1f6305e8ecc28e9038dcffa3b78e0d3
+DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
+DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
+DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141
+DIST github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz 6364312 BLAKE2B bd4cd06f9a98bf83285f3047e899d175b61bf5c33b272b3f592f4e4811b99f977b64eed5551a318b6449ce85fa3365a8ba425655efbcd496b02eb29ef8c9d322 SHA512 6eef641e3ca214686521c50ba0eafb6d4424b076db1048f995a3bf4d597247e52a74e0f2d866b6eaa67287d5dc01a6df9baa7cab9705b76afbeaf8d0a867484e
+DIST github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz 29802 BLAKE2B 60514b59195e988e236db3bac4e3a75991ee24d2e4fc404f60d6dbc332479d91564e30d7f3e8080bc251aaf532be47f242b2ee06c6c44668d14f52db9985d96d SHA512 67e1b3bdda441127e2aa72a3d7552e9a9477324db35d706c0ea84fa37953ad50b4770eb49c6cb56b9765ff57f9a47e8313941d29527224cbf587a6856d0762ca
+DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
+DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
+DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
+DIST github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz 21204 BLAKE2B 4179c708d75c58cfda85d463541055cd772caeeb67edc8446d068443bc5c7dc894e536a4cd3795c2104e4b3a891ac1f766a8c6ceaa4d000884bb3a529d3ae2ad SHA512 91e097bbf4711d203f6e31e73a1d67ca200a7ff707ab4f517f1f61fc2f6347fcd6aa7811bd4036a8f5211623cff45ca6acbb23330b4e453dbeb1f7aafc112fb6
+DIST github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz 10453 BLAKE2B 9aa008b347c27a66bd6fb84c4ee219bddb71dc8063975beb7e8d2d01b41589e9f9caebf81c878ae1122ebda9afffcc0d242ae29c69b25e33e0b1a773f764da7d SHA512 34b0aba157e3b51ff88bfecf55dcf1119a4da86a5dfa3e4ffd802d693691dfaa02c238a34e4fd32f668aca801af60d50eea13b95724946b4f66f29de4b9dad6c
+DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
+DIST github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz 2994 BLAKE2B 2c684342854093e6fea90287d6cd2e56cd5e180f2e452a9d56a73d0c51df3649bb3c15771b6274a200cd1928424298cd119ea3849f279f3a6094fd84e6a73c18 SHA512 a27f645aaeb46891568f1ea0223fae23d00a46918947446fa9e452fdb0b5d1f20bef543ba0be536f586eccd23e0bb413a33bc74b932cc05c6fcb74aa94ce80e7
+DIST github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz 18976 BLAKE2B bfdcc567253a24f882f5e524ad7516356024f8d0a1f81958161cc9f450438d26f6df8d5db55bf9e9fb62b88a2339e09cbb4b0594fbfa8ded12c4cf3c72034eff SHA512 e2faaf999792a930991cb99b8bea916dda5a4d0ee8503fc597581a1caefd9835e513555844d7d8a7818dd3b17fb532dd2387b9277fd4adda34fa7881f397247a
+DIST github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
+DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
+DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
+DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
+DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
+DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
+DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
+DIST github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz 25066 BLAKE2B 3560652d11e0048723a132111e168249bec29c10b2102c921763ca3db29d4981c39bca78a2665455e32fac1281baf843ea7308345de5b4ecad1b5553651fa8d0 SHA512 f4df44130776dba33d4b3879be4de1900815eb6320ec588781e180864dbfa827514b36dd74c1a310442c4fe0a0642a91b79b216541ac433efd87747641eced6c
+DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
+DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
+DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 BLAKE2B 09738718227b69635d6cab53397f3ba09295a683e7b8175829259381b232a8e56f4035710a2882c7edfbae61d94f673aa3e7301a343d1b1938413023b3c9f823 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02
+DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
+DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
+DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
+DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
+DIST github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz 242813 BLAKE2B 8ffdbe1a0175e33eb0c521b08b3a27649093986b46ab84c140953b53fba4dfdf6e0f022b5e5feba196e7df266b2ca7a5815875fc1a9fadfca6ed697800929559 SHA512 4c22c8f9287066d4e035f2f638e91b78a8731aac23e15ced5ddaf1e386125a89d196300772d59006e72f07c5d1b21fd01ef8ebdc8de5323606b6ff4667e62c31
+DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
+DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
+DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
+DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
+DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
+DIST github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz 414138 BLAKE2B 108d7af4da68a3cc194b5637e50178f5598a07b508ae823c11b9f35c4d6c27ad69b7f0b04fb9eb3c346f4ae5a245f44874d14903ca8bff52914298e1b1c4e3a4 SHA512 2ee00a592ffe4c81f7d190e9192723a9ce48029c378361857b627f0a7bc756bb8136079497a7843c6ebaf4c4dff33c925074a9a2f8438d86f55eaa81ff5bccdc
+DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
+DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
+DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
+DIST github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz 253475 BLAKE2B f2bb0b7d82d804d8f3bbd21e656a909e6d9f4d2694a9d06e7dedb0640bba8f785790c679e03b1f477f891e2c918ec875f882757c972dfe2c93d6a5bff87925bc SHA512 a7f52c05e60f6c2f31fdd4947f94bee6562f51b27ce23a2e7feeb92160704c8db0c21961cfb2f5a8ad3d66aa7feac2d94fe877752ad72d9a307691260c0dcd8c
+DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
+DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
+DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
+DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz 94461 BLAKE2B ae06e3ffe68b8e85ee05485225370ede915f36e4ebc640b78788ec3f1b502eeae1d300a5f7c03516d7cd7f94b37f1837b09e0cb7ae85cf71e01569a659d6f52e SHA512 4b16ee3952eda0900a00e6d45743790fb5a36602bf2ea57aa0b96c466291ea11059ca8829c96fa1406013f29e178f7c007c5a20e7aea31f7e56b7fdcd21e7958
+DIST github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz 8239 BLAKE2B de4608776b55ee59aa5d12b46c97f1ec848f9a43ab0b52b46ecc570cfcfcda8274c4d9d856a78e3ca0cf9971ff8a030f3d9c794e8a911b554c098b841cb5fbab SHA512 8b1d1e70e25861bc1094cc2810a070905bd741801683bbd9279913f81b4463e5cd040ab17aaadff52034874557293a3acee730438d2291ae617215a3ac16da77
+DIST github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz 1291393 BLAKE2B 184358098449fa3fabc46fba82a48f7037cd769c983acbbf8371437daad6170f0faebc9cee7babc776ecd8c9234c0108f0159360330eda9c186eca23538c3254 SHA512 f61563caa01c1d08c0c49cc3cd26d94aa44d6848c515091153235e92bddbe41b9621637479fe2256a01e722d0ac61f3534ec0b6ab953bde668ccaff4fd9a6781
+DIST github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz 4570659 BLAKE2B 50d421caaf529c12e1e4ce07493ffa0c92daea64b68d63992dd85bc5025f928df454a8af6701cbaa9bc065b61868b079d04dedb50f6696a267a4c5d790a28750 SHA512 cf74085a3bdfb6303243d42e438d7291300f1cff01c64aa854c444be52c6ad81ffbb868ef3eb3850225c62d25337d0eec7f7d1044709f1b5860121bec44b703c
+DIST github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz 1485046 BLAKE2B 51a95498e0ba00b19e0731604feb001779d2798d73a3c64a7193c07fde01ec71a6a9e4a3605bcd50be33ec55c92be71c15039ac70b0f9cd88a566c908acdb11a SHA512 12f63a76fce8465d2c294e65c2b16a30fc5c2ede65d63e75f3a7b143e6c5acfa2abe673508a9b792b0b5819ae534ae1018edfece1431f573e731e33d5e244807
+DIST github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz 3869160 BLAKE2B 7e3fcafce1ee62a7e95b1c09814a3e5efb7efb20642214e0f2b093e11e797d8ddc312c18f7369b0745d344470cf1fc9d3ce9e582a6998f2df8f139cdad812427 SHA512 8f5cef4f90fa6ef9d64fb3ae21c68f3b7785e758bbc4f85dd2b7f2ec07f281a3df66ac1705f291b834513341f8a2c20ae1601ab65e337f313c156f5c4e9b481d
+DIST github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz 2350724 BLAKE2B 9d621d0de3c1efa647846478920b01600ed165aeb53c4c3464efd1e431f37e9bb7040bdfc5418cf3f282e101475fa868e2a2a95f969843dbbe0c4b7d123457a4 SHA512 9dfce761a902950c4080826d78d427d91724210cc059336e322c8873ebeb1b483f2b86b2a39e47d5717c98331d15cdffca1bf2a09699d5752a46ed968e9739f9
+DIST github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz 27068 BLAKE2B c2b433238a708feb8b087438de90a6aa435ba88dc88f63455604ed7b02a9b7cb6e84fdcecf9054d20fb8e6244e8b3c5c6d26108bee04a1faa7bf1e08c9554b09 SHA512 ad865c986a7eb0fff44deec908a5217a935b283fa170912b0cfdc5f3b96a95ed60b49f991480a4e37699d4cde259cba9f85d4fc0e8757e9581048122c89f6569
+DIST github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz 23391057 BLAKE2B 1925ef02958542f4da3f95fa1acf0002ca454acee73439d73bcce28f381738fcf69a3cdafe76546815df390096ee76f7e2b532bc7412e7a2c0b0d510f1a40648 SHA512 fd54ae65260e8b62ab203fe41dc1a9ea9982ea1e986ce7c49971769aed0552d1f0baa162946d94207445ab5a5d0a08806663a496dd4fb00da451a86d72519ac5
+DIST github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz 57396 BLAKE2B 31de627b9805d3fe647d2918a839655fd164b45da063fb4d11710b65354d6f2b447d7ac6dae558b12512a15d92494cb4647fe859bea69b4544520452a206ff62 SHA512 f0988a6846a8ce9a003cc8898f0777994c162f678ea5986986163af0db366682d8a98a39029c486535c330f577539be39c34be2fe0c0113c7895fc94a1235eec
+DIST github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz 7540 BLAKE2B 7ce585f807a952e11c316f212b7d348485213f94ebd558fe1b4c228c84d3adfe7273d5ae5393e17408b357a0f37967e806e15bb66c2d8139bb5e33281cc7f1e8 SHA512 cc2eaf7e71b8012635ef6d02b00595d5e7d2a321772699199d61813e3ef1e1ca3c3239de264ab2b719be5a452fb183baf4fd5f87e988a15c51064423d6f2d9b6
+DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
+DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
+DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
+DIST github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz 6142 BLAKE2B 0d210f98f23ebf6f0a4ce27341aa204018d26f2bda017694cb856b6dac2fabe9865369ff80c73bed4801f4cc6c1c2fd7a6567835b80e42ce20a46cff296f6426 SHA512 cef5fa3926a464cfc655345d429644f1082211b003de64e4f2de5809fbee68c4935c2474ad502b56112132149c87a66c9cc353523c526359bf46bdfe0a766fbd
+DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz 18386 BLAKE2B c484694b778f0e71b94628ffebcaff6fec311f033540d2a27202b8e1bc6224b1a48a8670f6f7ecf10bc2f406a9cfed98f0c9565215e4a297786f041e940996d6 SHA512 3061c0372815652836db5245519ec2b0a2f71eac1af7c23a419edfa64063e6f39e91a1aae2ee1ccf1e97a96de620e15684ee660f9039e694c7b9b4ffac27879d
+DIST github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz 136692 BLAKE2B 99eecdd38938c9ca5febb494e1a102ae60fefa9b8074ca9422c7b10295caa09a50f66dd6a02c6c8bfc61513d23144ba660f383684c077caf5791111ec1c9c92d SHA512 cfddcfc6863fc9ee9fe5ea59ed0da8bce7c8299117155e404f135b4ed2f7cec00881b8d70273a865ab84a0bed601f191f328b357b7c50d204016e81ac8c47fb5
+DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
+DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
+DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
+DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
+DIST github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz 58775 BLAKE2B 05173a41bfaa944e2096b4360e0974f921934b6e6ec8b34cb7322158cabaa73e60ab091d4a5bcc9696b29995e7f71bdf55cb832af140a153452cf66c85c9a3cd SHA512 9d4a937d12a738a7802102415cb061e0009ed43f901420560637e13f7952c26dab52e67011d8b1f8ffe474e223198a23becb65a6eb07cee1be9f6b1add566fd4
+DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz 34890 BLAKE2B f0284354e3782e07371825b3fd6136a5fc516dae97218c90ac333ce749f87b435a55c6545691a7b71f90b98563fdba5f96c238007ee8187d98297edce1124cd5 SHA512 47cafa8b7a4f9496e1cfd6e2d24ae882ed3ac21a2417eb2ece2cfaa2e391d32b60d2ec8c3860988d8fe3af8bfa6d1430e938e5da1331a7e1df2828753dac82bd
+DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz 69591 BLAKE2B af6a9dd3e0a9186bb6f96b73faf03ce69d15083fd664f212cee1aea8288094dd9a3a158da07d4a27a44a0c14f03fab50837f3cb517b0727b77ba8297651805be SHA512 616af6fc95fc5e4825413ec6590fded0cc837af3887cbab814828ffe9a55f27d212f0a67080b867d7051cca2a45266da8f8886360249451fd983cefd340f0023
+DIST github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz 7607 BLAKE2B d0f59a0862b44a5c84b9f4dd65eda26facbab84f57508a346c060d6468fd6ce8cf5014d715a43ecd56135f101d9e7aa33714431cc4ce6fd809fa2a1cf865ea75 SHA512 2bbff9fa393814c4c31ce033d604d29b908b2b110b154a693968bc1f8859f8417c402a183fcfdf07c4732576f285df92b57b9ea954974ff8e6a753ab3d82fc39
+DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
+DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
+DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
+DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
+DIST github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz 169394 BLAKE2B fe292aaad3f31173e1ed0e0d9dff74b9f5c46803acee9476f86a4822327296bfe52009d68c1b7bc2ed246596032e74a597eb951795a37eea9518a01ab4b3ad9e SHA512 adbe58e9286863ef674b6204d3b56276ff4e3bb1743af53e369fd2be97ee28dc26bb89f509f9b01641731b058db464af839adbad0e31149503b57796b22b2be8
+DIST helm-2.7.2.tar.gz 823059 BLAKE2B 3c4b3270055931e92bdafa29dcb182524e08744b3631bedb384bc34c3fd71dfd3aa60a9754b270d8b69999824166314439e14b53f9659543d69ff30ac7dc8116 SHA512 8ab947faa891102d89f229d79b6e78992b7a37d9bccc2a7c882482dc8143619acb1409d5643717d8d10fbd7e0df9da07a1ee18019bdb6befa4ce189112001b4e
+EBUILD helm-2.7.2.ebuild 8289 BLAKE2B f442ba6ae7d1d690543810d8fd24a699a0fe8bd19d16cf7e9c0d17664a9fc2b0d398a9120619e01d39ffd8c9145a1a5df28ea19847becafb48640901bb5054f0 SHA512 dc1f91c21a71e51d3c87db17b0d543ec4aca1c4b36da9f65bfe02ba7b693d6a66a6957fa5597f95a7c5d9132b8e9126d270c96ce7ec8fcfe454defe40a714180
+MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.7.2.ebuild b/app-admin/helm/helm-2.7.2.ebuild
new file mode 100644
index 000000000000..9bdcd6d2b0dd
--- /dev/null
+++ b/app-admin/helm/helm-2.7.2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/chai2010/gettext-go bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/emicklei/go-restful-swagger12 dcef7f55730566d41eae5db10e7d6981829720f6"
+"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+"github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 36b14963da70d11297d313183d7e6388c8510e1e"
+"github.com/juju/ratelimit 5b9ff866471762aa2ab2dced63c9fb6f53921342"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig efda631a76d70875162cdc25ffa0d0164bf69758"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
+"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 8050b9cbc271307e5a716a9d782803d09b0d6f2d github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+"k8s.io/api cadaf100c0a3dd6b254f320d6d651df079ec8e0a github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver a5bbfd114a9b122acd741c61d88c84812375d9e1 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 3b05bbfa0a45413bfa184edbf9af617e277962fb github.com/kubernetes/apimachinery"
+"k8s.io/apiserver c1e53d745d0fe45bf7d5d44697e6eface25fceca github.com/kubernetes/apiserver"
+"k8s.io/client-go 82aa063804cf055e16e8911250f888bc216e8b61 github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 868f2f29720b192240e18284659231b440f9cda5 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4 github.com/kubernetes/kubernetes"
+"k8s.io/metrics 8efbc8e22d00b9c600afec5f1c14073fd2412fce github.com/kubernetes/metrics"
+"k8s.io/utils 9fdc871a36f37980dd85f96d576b20d564cc0784 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+inherit golang-build golang-vcs-snapshot
+
+GIT_COMMIT="04769b7c26109aabfc9c6b645b345d665b6bd0cd"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo ${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	./scripts/setup-apimachinery.sh || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/metadata.xml b/app-admin/helm/metadata.xml
new file mode 100644
index 000000000000..0eea3165859f
--- /dev/null
+++ b/app-admin/helm/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubernetes/helm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 93785ccc574d..da0c6bc8ee02 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,8 +1,6 @@
 AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
-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
-DIST mcollective-2.11.4.tar.gz 1517194 SHA256 2bf8425a50023744e28f26efd64931d6383b216e9918e1df49276bc5477e4493 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b WHIRLPOOL 4e6bed8bbfbd9bf08c3380891321dd2fb673ffd4408acdd0e63c14ca3896d07014f6b034814f98ba89b52818522d49f4ad95d114cb940966ae13409f16ce9365
-EBUILD mcollective-2.11.2.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
+DIST mcollective-2.11.3.tar.gz 1516665 BLAKE2B 1610ee73bc44bce3da458c150837c1462a7a1168e8d96acd4ed0fa1a29d1f08bd20fb263cc219f3485e813c669937d8f4ea6243070e8e9bb5a6112e9cdcb5b89 SHA512 f5e26dff03f7a671db5de12acba1ce726c8d57fb99831ddbb258da5ba297ade31ea991840fa63cb1ba261281f7f6167a8492c8764a13cc332202ccb9c88d79b8
+DIST mcollective-2.11.4.tar.gz 1517194 BLAKE2B 8723d433e4b8e07b4aecd8c9d13c322ba3e3b6cb7153dbcbbc2e2463fe0ddf48c7b1c1d659e8a28278bb2fa4ec6b3da2f148117b3633b8148f9ba5a0aaabc4b4 SHA512 56af0a8b64ff75351f3448396f8a7cbba603869cdbfa7a97dde5a820e2e287c84e410a77469a3ce01f398858f5c6570c9e3542e372eaa00e3f54e68e3c1ce63b
 EBUILD mcollective-2.11.3.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
-EBUILD mcollective-2.11.4.ebuild 1643 BLAKE2B 0cb1d859671f6295f0d7d5d6bb9a7855966843fa2e643db13796fdc53ecf8d9f4a01a0f7024a270dbfa99448a90737c517ad2dc304828d506a8ddbce948cce5a SHA512 1b57aebd8141f77295a4fbae23c5a25889373e41752f4eefeeb96a856f0c7b78390687eb38bce1d901e5a348f3e55ed6af4dc648d89a19e0168a1de8f30b55ec
+EBUILD mcollective-2.11.4.ebuild 1641 BLAKE2B 57d13dc26a9a1dc56591996ef558656cefe53001ead0d8fc4038db875d7fb598a474a370a23f03d247e19dd5358c136b6b0d3208b96aa2155cad84b00dee4080 SHA512 a699fb934af4b660c55ffb0d216e29d3b995601c1187e166e878fdbafd46ea7cea4e4951a1052139d115f00de1a38c990495715047f2c0ac13926b2fb613a25a
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.11.2.ebuild b/app-admin/mcollective/mcollective-2.11.2.ebuild
deleted file mode 100644
index 1e7cca4d5674..000000000000
--- a/app-admin/mcollective/mcollective-2.11.2.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"
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="https://docs.puppet.com/mcollective/"
-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.4.ebuild b/app-admin/mcollective/mcollective-2.11.4.ebuild
index 795e37902641..1e7cca4d5674 100644
--- a/app-admin/mcollective/mcollective-2.11.4.ebuild
+++ b/app-admin/mcollective/mcollective-2.11.4.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-editors/Manifest.gz b/app-editors/Manifest.gz
index adec342129d7..76fd90fc70f3 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 14915af48e17..1c5d506a9cf8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,10 +12,10 @@ DIST emacs-25.2.tar.xz 46900336 BLAKE2B 4bcb1dbf1647e1abd1006f586f5e465fa9ced78a
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 EBUILD emacs-18.59-r11.ebuild 4147 BLAKE2B 0e2dd5108b45b65ebd655a147cce8555c899dfa3dfee27086ca98df42dd7ad3d0cfc5ad5131e5c3757d68d0c5ea86f19d65d9383af69f7ff2c0cf9778219ba1f SHA512 fd953bf529ec8f3094fcfe1b22ba690efa419059ca2d01ca2246f13554463eb586ad402ca58f12a4dd00c347358365633e52f7191ce8989abf48dc0c2d7813ac
 EBUILD emacs-23.4-r15.ebuild 11217 BLAKE2B 70a89b56c0d217ec9fe83f6d874270b8fd70839c69c9f10da35d11fa86fdc330aaefc99f8136e7ed6b96e85fb8d6e6b12f72c4b2628c7dc7189e37d8f8aa9f3d SHA512 a70cf6e0500f7b2a8b63d06340a60d99283a51e21bfd6954a0ed6cfbf0b5a12204f43c9b7c661022d8f147cb5c88f5a37f5f987ec36084abc3d584e809090bf3
-EBUILD emacs-23.4-r16.ebuild 11219 BLAKE2B 05bb01d09e5906b7d0d741177f4afded231a13fc562c9ae7223a27ce1cb1c5e5b2050f3451e71f512a155790bbd738712724e175e322c0940c69ab752c13d25b SHA512 9f7c9e017fbdc13d69fbf802ee6a3900e0c816c8b6f472bed22e13b23e658d004efdaae84be010b3822a636653a009d41206d8ca4294e1fca5d5a7cb5d40dc6b
+EBUILD emacs-23.4-r16.ebuild 11218 BLAKE2B 2e94b619261f0ac89c4b7bff4e3331f89d5a1a1af57fbf7ab2d444165c2ce8a85b9d9dce92b92aee048c159a569b48804b02564ac1b837f1bcba54f542d21d76 SHA512 744efa2ff0f4fd7be19e1d44426b28e8e8d1f46b60f3ec824a3298df0720681766a4d15a544bcfd3e31ea6a42eea828fa92d64b84c32e8a3f7d821cf2a237cab
 EBUILD emacs-24.5-r3.ebuild 11048 BLAKE2B 96f5239b2f3d278c615b4fa04e89b8356407d139427e5dbed42adc076855b7e0c516fbb852c9d1793081a5026f3d56143932299ed5f30f958c3b8432a449c1d0 SHA512 4a612329a0f585db081c9727632acae909db7741c7604b28fa36fca42539e4f44928a685d603bba7946d2c1a95db2a23513d55726eb15bff84d3773b34c92353
-EBUILD emacs-24.5-r4.ebuild 11050 BLAKE2B f54a8b162bcd78fbecbbb86dbcd9d13d508df69cbbddd88ea3e360544381f2a3e8dd292ca369ff32e50f5b60314aecaf94b5cd038d6d919947d566657232a134 SHA512 44887a9b0715902f069734429bb253443c1ba555a729bcbc839ee61bf2e6e2bd53df181eace9cd0ba68aa8b6a34280583e3644656e2d7f6f3f5b6af2c598ea39
+EBUILD emacs-24.5-r4.ebuild 11049 BLAKE2B 219ff8620474dcdfea1ffe7a27e97b4514b3d82975ee2daaa1a98d98723933802865bcccbfa082e54badce4a8fdf751c3f52bdd9fda4f81be20839fa328b7d7a SHA512 1ab721b10efeac79b1f49dedab623fcc5edb27b11c30efe2a070ecf46ef915ffdbb6801e061faa230bd8389158f768f82af2b10c98aabee22834ceb12ed20de8
 EBUILD emacs-25.2-r1.ebuild 11534 BLAKE2B defa0b46ed5ede9eca8a4edb7e3dd06fab21fdd53c854faca88c105c58fa5bf65145ebaef656f59da6ec128d33cf5799adcef33a94421e683f9b8c710a9ab932 SHA512 e29e7e2c3f8987843203799620099f3da70f89d7e44ad606f2b7f4ff7077333c7e783c3b327d735165b6d9e38e8f22a8eb635b8f412c53a7c9946e81467bf2e2
 EBUILD emacs-25.2.ebuild 11454 BLAKE2B 077f9afdd91374e99ec85cb61da76339ca66c08a2c52f0a2ec3333f7f163954c3c85c9b991318c0b45306ad6cea163300ed7ef22b371675a10266ee7482bcea5 SHA512 cd770b82b502e2ce1507345cb4e011f9df9a1b7243696dc5df1e705ec374e43917177e6cd7d215eb8426f1460b80b29c2bfb51a359c7fcb2c0a40bc51a3a1f84
-EBUILD emacs-25.3.ebuild 11457 BLAKE2B 037dd4ae280091add3ac0aa7563a0c08945a5e5cf2a6c45439e62d63a1cae4403eae29ea493f0507948f433ea9249a47fbc0ab2e6b5b6afb47ed466fce3fc21d SHA512 c74f92d0c40d8cbb40c9b4d179ba40d94409eecdc397faa35e64f81ddc0fef88a86b2f2eb93795ad0eb0d613ceb1dfe290d641d9e1a4a7e94d33ffbe5dad2edc
+EBUILD emacs-25.3.ebuild 11456 BLAKE2B 961e16d2c09d2db36d4ddfc92ffaa1c794bca76729a48fd32e0d18b9d5f64364f7a6e1dfa46cb5148cb116c861fc6299e5d092103f5a4cf2e866f34d7a9ffaee SHA512 a7bfbb0891ce8667a21017bfee4a3d9899da0536e996d8c50918cf3c9cb8355002bfbcd2f50e3468e920c3e809bc89849f59ab6427399ea0d554354b0d14294b
 MISC metadata.xml 2759 BLAKE2B 6054420573e7ff20ec4e946e666de88e5e925edf36a2b86ff4f6f1f179c3a4d82e62b5e824b154b8f68d98cefad3831bec4f3a1b4e92c34b2c8ffc76254a3b1f SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42
diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index 15369355c279..210f81f16181 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index a09a7c74e569..12bb3ccaf3b7 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="alpha ~amd64 arm 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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index e2c75ebe4c4c..53ef8c9a4b9f 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-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="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 motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0c7e2040dfe4..15808d48a8b2 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 9d72c9b4d175..bdf268401d54 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,9 +2,11 @@ DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
 DIST containerd-1.0.0_beta3.tar.gz 3696070 SHA256 efd40a7fdcb07b23273c389453559c0521c2cf4baf669cdf134cd10a21627ee4 SHA512 45853001bcf57f7289747b71215eb0bc60b18e54db73896779f294db1b72374cf36c8792371a8d46ddfe283dfc9655f10cb61b3a74420a79a4abb9fa89b76323 WHIRLPOOL 63c47a18c4d5f09043d0449a042c453451bfe4fedcb1e22eb35080c3730b1f181fcb58131f58ecf8e819688ccdfd9dbe4fb70cb9f3d08782257bb6126f05e0c5
+DIST containerd-1.0.0_rc0.tar.gz 3757536 BLAKE2B f316f74ddbf6f5049e9124de47a6f988cefed6428080b3ba9939da1deb3f6146ce4d9c337b7b6f5931901390e34e8eca47b7070d4812dc4edc5bc6e280cfd777 SHA512 32d9a115214b15e10782abc8ef37115979ca49a0bbf38278c280dcb0822761f38178826f934fb034263e7e0ee07be7558b59c26276edf37294e908f4e51e3807
 EBUILD containerd-0.2.9_p20170605.ebuild 1000 BLAKE2B 16ffbe24d43a2a8a46023a1a2d454e06141ceeab94f559986960fc285f31d954a166f609c11b021d44d6d36d7d4198b84ea70768a30aa2c16d9a044e17f78fac SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04
 EBUILD containerd-0.2.9_p20170917.ebuild 1001 BLAKE2B 3cd479b76dc812f5dec2b85e40bb52d4ce856bcada67d42cb1816cd4cd0a6afdc39cd0ac373f44453d5776911e1ca292608aed81cddcedb92877f8729cacd7f8 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f
 EBUILD containerd-1.0.0_beta2_p20171019.ebuild 1250 BLAKE2B f0f6b831f90be916ef5841d4da3a5f14ea9569c978fbb250cd47df39020badc540eec2fa1a165e9b4e93d705bbcdd40d83317eac6db113c80ce66ff1ad1cfa00 SHA512 31eaa813c4ed0cf942d9b5b8d6b42acb33838b606d74706d02affe7eca3393f1f45644e496b7353b517a051c982111b872ea58a12c6644664d88ba023e2de185
 EBUILD containerd-1.0.0_beta3.ebuild 1248 BLAKE2B af20efa2422d5f49562841f47c0917f17e86eff0ceeb528907c7cee1189a4972dd90110e42e1b7b254a9bd24e1b3a9c7fc927e35b7b4397fb013901468f662c3 SHA512 2ab70d4fd26b1c9e0a7e35810b7d33a75f93961ccaae27c0577612fc55c3c71279fa18e05517d1f5df6e872d8a693eb7c3958d40a6aba9fbe5cd66fd711b8887
+EBUILD containerd-1.0.0_rc0.ebuild 1239 BLAKE2B bdec597a8aa2d7cb48f1dfe8ff62b868eafade138a7d4ff632a06bc3a909dcb363e148cf2829ea92cbf567cf5ebe2bd7a65e61297b8a1c70c6791c0d674c24df SHA512 82ef92a1cab9b54526addb374e253f6761b995366f98b90ff35ff818794b356e360ba7f72ec0e21cfc24e611f716b8f79c8385986433e14c3ed4549417cd15e9
 EBUILD containerd-9999.ebuild 965 BLAKE2B b671ff0dd3c5b8c72f2d713c04926047a304b7eec201051b5051a4ce49550176683a934d0b03350d5302fdff242e8e11f31b3db0b3962b73bcac85a0ed1a116d SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012
-MISC metadata.xml 909 BLAKE2B 27e84287296be6c84600449e3f2d8b3553feff2293ed5348bf55e203099304d287cad7810349b1b74ad85d7cc2fda184693c129dc7453931b5d95893b7fe5529 SHA512 bc18fe0db42a7d9eccc8757f18a92ab3c46f1941f0cc28e0ed4c7be2569b7cec64e1ef49bbddbaab2afea5925f67bb4f6a06f4d1015e29e73c9742f475731d03
+MISC metadata.xml 985 BLAKE2B fbef8e091234b75e89ef860f1b43114cfefa79ab65b434592bf4f8699ef1c95b6e126e7f848e401b9c1bb1d9c0ed67a86f0147169aaa3727bc26029d9f92d869 SHA512 d6ef315f79b599a8d47fda31e6e6a8c82e6dd52c3ca8339984ea72b43d6dd255d1b46fb7c566771231eba208796d3438b39cac22e0823430d9f59fafdef96147
diff --git a/app-emulation/containerd/containerd-1.0.0_rc0.ebuild b/app-emulation/containerd/containerd-1.0.0_rc0.ebuild
new file mode 100644
index 000000000000..5b020eaa7ee4
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.0.0_rc0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="08f1793"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index 92b6d2585af4..7cc463053468 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -20,6 +20,9 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<use>
+	<flag name="btrfs">Support for BTRFS snapshot driver</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">docker/containerd</remote-id>
 	</upstream>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 69b09077850e..54a5bd5f901b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 9f64403bcc2b..e06a5e1be66f 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,5 +1,5 @@
-DIST cmark-0.27.1.tar.gz 215574 SHA256 669b4c19355e8cb90139fdd03b02283b97130e92ea99a104552a2976751446b5 SHA512 a7797c9dfd54e20499666e37ba67b1902ef0d40867e7b941c1cfc93d4fbe935fb073be69aecc9f9f8c8e9524049037771635b45e071af981613431f3fbbe7b41 WHIRLPOOL 0eac7dd03176ca0fd21f89288b8e1ce92889cac00690e512304afa58c4e1777040697b78897c851a8c1c59d181cfc6e5ce3f5a980efd9939f66cc950e91fdc07
-DIST cmark-0.28.0.tar.gz 228973 SHA256 68cf191f4a78494a43b7e1663506635e370f0ba4c67c9ee9518e295685bbfe0e SHA512 86aeb42f17440c8e743057851bc3cee9ed4b3fa27dacc37d6af54dee7739210a712020e59c102ed1852b7c3f904881cb4e9b80ea475772095514c4025284cbb6 WHIRLPOOL 27705cc8cd65c5c094eb62a2d0e44942aa6f89e86218a8971ca7a6d617a49fdde44ff7358d77dd36fa42ff0cd6a54d473695742f827b773300b76bc221477cea
-EBUILD cmark-0.27.1.ebuild 815 BLAKE2B c62c73b36b7aecb4402e47e9b3a9e2c52834e1a4747ff867ceb3f2fbc3467317c42eff23fb8535e2905293208e76258df379d79fb82e81797df8d03f8788395f SHA512 085a7b751106662ae8a243e87629d043816ddb157730596c09688895e512e67054791bed436cc6bb22b140bae221d43552f1326315c44c8b24bb808178b98b04
+DIST cmark-0.28.0.tar.gz 228973 BLAKE2B e0f42a7a5929eb8fb7a2fb9405372d626b2fea5f895b9320a28629022a8280d01af67e8e13101565ce86a2dbc4b8191eb461e70e45e7fa33c72b8e8266c2ee78 SHA512 86aeb42f17440c8e743057851bc3cee9ed4b3fa27dacc37d6af54dee7739210a712020e59c102ed1852b7c3f904881cb4e9b80ea475772095514c4025284cbb6
+DIST cmark-0.28.3.tar.gz 229391 BLAKE2B b235d3dd8ed9b83d8fd6ec495d311bed854ad61d28e5a5087f40f7e512977892fcdff7c51e8683db87e0ee8e5e73338fe11b8829e70c6f07c59e917a8b7268cc SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
 EBUILD cmark-0.28.0.ebuild 704 BLAKE2B 9c0ebfc47577cfef39d9333594d0a200d96ea64f57698cced39e681c3576790edcde14329e1ae8d03e9df38f05c2cce88c33d84691860482b073127f1536589e SHA512 c279cc5b8d899436fed2eed3d4979ac462b28f2248e2fbab934d8ce4075447c11525deb6bcd7fdc7544c36abf71b113ab6266f59f8a1f626c9b84b0fc38e0764
+EBUILD cmark-0.28.3.ebuild 706 BLAKE2B c7c63cdabcfaa6a2afa397a49d3db78babe53652c70c16f3bd604ecc8b78a9fbeede0f8fbf30e0429ed60b20408b1f5e31ece17c4dcbc953f1e7ec3450446864 SHA512 5f8acee125f9ba6e220a8e95242f4c98b73cceb0be58241c75c66faddde600c69e5b01d5f6a09588fbe50eedc5c863c29c307f21560d48f4aeb084c0c6b2db58
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.27.1.ebuild b/app-text/cmark/cmark-0.28.3.ebuild
index a69f2b36f50b..55850c46f6d4 100644
--- a/app-text/cmark/cmark-0.27.1.ebuild
+++ b/app-text/cmark/cmark-0.28.3.ebuild
@@ -3,37 +3,30 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit cmake-utils python-any-r1
 
 DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/jgm/cmark"
-SRC_URI="https://github.com/jgm/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-DEPEND="
-	test? ( ${PYTHON_DEPS} )"
-RDEPEND=""
+DEPEND="test? ( ${PYTHON_DEPS} )"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	cmake-utils_src_prepare
-	# Remove static library from installing
-	sed -i -e \
-		s":\${LIBRARY} \${STATICLIBRARY}:\${LIBRARY}:g" \
-		src/CMakeLists.txt || die
-}
-
 src_configure() {
 	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
 		-DCMARK_TESTS="$(usex test)"
 	)
 	cmake-utils_src_configure
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 54004b94d6ab..f2bf72cb64fc 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -1,6 +1,6 @@
 AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd46086aa7000947055b800ee5955390ae4aca0d86d49646ffb965f653e4286e1e7c34a1aed6511576831d41813f9 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
-DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
-EBUILD opensp-1.5.2-r3.ebuild 1955 BLAKE2B d060d014233438d5f07c2e6da3ef4990ca93b5e8b5c9f3f3284365d54f167e7f0d34274aaea2f10493690a236ae8775aa8d52cdf2e42e37d39edaba320d04444 SHA512 f0318fbfaad8c2c8523cfa438d75b514c31c77d4ff8fee43496ef8da6acb3c1afcf1d1256aeed80b062aff420efc9f1bf819e4d4f27bf4b1f580d1dfc950b001
-EBUILD opensp-1.5.2-r6.ebuild 1956 BLAKE2B 14192850a32756d64e290484c2c8e5661bd0e85bfffff7797f4609a829706d47d2bc74b8ab27e8f6a726cf1cfe23357551111c24f86ddbefe7e9117868225e79 SHA512 c0305b0aad809dfbeef279c93cfe6366b7989a43c636203f37bb9dd863017c9cf5197baea5a3836bd7913ea2d58cae329f6423623940e44d0b7a399e5ff8afea
+DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
+EBUILD opensp-1.5.2-r3.ebuild 2009 BLAKE2B fa968acd690d18c3afcfdff5274c58cc2f9fc63aaa995680febf1311faa1db8dfc53dab4eef8b7bee6cf62ce184681f91bf54a8c236ef488620212bab0eee7d0 SHA512 043bd3d98842f6ff9b5d794a7549a0d29314f45016b3c8d2805c373b676d934a991902c5d50830a031a05daa679ca93883147eb473fbe427d75291864371a6e9
+EBUILD opensp-1.5.2-r6.ebuild 2010 BLAKE2B 07beedf2cb021d210a2fc0d8130e10be5e7956faca8601a3c7b2f46b240913978911285d949a68fa45f23153d9957d802ea283c824e7ebff13ee4d8c210e42e7 SHA512 db6092c9dfc7570285cabf1c86a581685c662bec6c4d32a13e45694ed7e794f438da195551f556070198e33b208f27f8a3f5d201dae4a9455157e3bb4be4503c
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 4bfee9c3144a..f1fb3aeba51d 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CONFIG_SHELL=${BASH}  # configure needs bash
+
 	# 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
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index f2198eb5e884..717283d4b91a 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -38,6 +38,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CONFIG_SHELL=${BASH}  # configure needs bash
+
 	# 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
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0be37abb0c2b..7187ab94fd0b 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 96e34339d77d..58c39e10c9f8 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -5,13 +5,14 @@ AUX pgpool_run_paths-3.6.4.patch 10760 BLAKE2B a5aab30ba1d0a478f4efb119117770c57
 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c
 AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259
 AUX pgpool_run_paths.patch 7443 BLAKE2B 456080ad743df95703c4cfd38b20d5ff2944d8848d617babe3cb8d63ea2fb3307828f448609298ab08db902dc60eb5780c0f6466d99eb1bad9485402ded8c42c SHA512 227716daf9d93d1ca0c749faedca3d1c9e35b64eebe4c61db2e37f94ed2dcc2e97e34118d853b3dbc848e395329c05c026f819a9e5350b4f0e32b269932d68b1
-DIST pgpool-II-3.5.2.tar.gz 2227075 SHA256 5d29fd9c30141bfdaf15b51c7878766178e5df42fa5e160d0f7df2824d26104f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a WHIRLPOOL 22939c855919b8399c1129ff4622eae159141e9bf05cc36aca456bfd582c7ab0dc7ec87df5ea96d7101f438e89bf4e06f46a5f63cfde22e505d0a3965c0496fc
+DIST pgpool-II-3.5.2.tar.gz 2227075 BLAKE2B 4f40044dc37353a811b2f4ddd4bb6d41604e1fc5c64064603fcee704a92a4e4d3b1baa83314f476dfe32ecbd851208996139a55ffaffb3f1bb9f8ac72685a02f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a
 DIST pgpool-II-3.5.5.tar.gz 2243184 SHA256 8fa1ccf13ff4f7c1ab0f6d523090444f65d78923de11061b5027eb5d58318491 SHA512 f77888cbc5e2c15ae1035ee3a1965d4fd3d02cdfd5810c6c656456eaa0d73dae7471906bdf0848607723633da5b8d02145559b767735bcc9b7e4023b1d59efed WHIRLPOOL 5f4d4d9c3f6478b9b3ecda311c571e1f54805a07aa505acd32fbfb8fb2790183b732d6f86843a2b6614c74565efad7f9b3d962281cd2b1d23b54515448a1c84a
-DIST pgpool-II-3.6.1.tar.gz 2539510 SHA256 244f99a70198b5861a63b2fe3e44ac39d2819f6aa6497f62958c6afa2750d94c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a WHIRLPOOL 9a307a63e9179ecfc7a52d1f056d47f09543bf4e378fa0090cdaf90d141c70e89323b4cfcbc9bbd9fa2422ff76bea592f189bea78915445fb1779ce9089ef6e1
+DIST pgpool-II-3.6.1.tar.gz 2539510 BLAKE2B 844f54a2f74251af8af1348c374807e1dce2028eb64d2974c7fb1b904c6518012764c16fdd7fdeea8b9039fcfa13d8c139a9b2e020fffc87e6b90f3d6a489e5c SHA512 9d4f0ecec3cf7478c7c4cd5cb1aa75614edca204d11b145f145d752c24bed7f7f4ea2880f6a3f9833aee0b5f428e8cf36e2f91bdef2f6065fb98019df546469a
 DIST pgpool-II-3.6.4.tar.gz 2623625 SHA256 6ad78b9878d126e8da1e03e8edf3c8d56bb0754fe6432f633e81f6faaf8e6dbf SHA512 a44724b77faca12bc2b46a88e307c10f8099574b5a27720c98f2939fbfa61f41b4c3dc03565412972c351c10d57da4324a483c310b52f624f5ba87c2bd4d006f WHIRLPOOL 410136d359baa369f3d19136da54ba202c8b250bf364fc2f9b91a66190266ae523647cc89313211b63effbedd97168d026a2574be059dd0da7c8768b2d9714e7
-DIST pgpool-II-3.6.5.tar.gz 2651330 SHA256 f7eb62bd977a24d9187dc6aca6dd73b3b9e322cb3680ab5f5191a7e802a3cc9f SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d WHIRLPOOL 22a153afc9f4a37ff52165ac6e79464ccff42600dddf085908da5cd6a62d7a5d5690dfe029adaf197f7f8b9d4f033326b5d2f61648133db3881129e8c1c55499
-DIST pgpool-II-3.6.6.tar.gz 3171264 SHA256 5fbdac14a07b4f4cabef8bd224be1fbb0770d9aa4731d8fa7905878dc4c22fbc SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10 WHIRLPOOL 504c49cccfb3be78144defc5eccce46e1994f0049a9b5835130ffc7b5339f05ef5a562236053c4b10a711053384baccbdc96eb60ee21ea24354627f594bbb8f1
-DIST pgpool-II-3.6.7.tar.gz 3188186 SHA256 09cfe2cb36b9171d4a987a8b100e298e46d6a369c1b61d9e1a47d442ce16e249 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc WHIRLPOOL 7a17fc13792d3a7b257577013e8e9d5264d928ba93f96a6a9ecb5a08ac9ace246f22ec655e12e12e46ff371c411835cf8dfef3528bc70625daf197850adab9aa
+DIST pgpool-II-3.6.5.tar.gz 2651330 BLAKE2B d0ad069b17e1e0fb46590e7dd0dd29feb499a6703056d5ff5d4f218227158f4bca44f8d52209f378d08879a97c7930f85a61dfc22fce0bafa1313ad3c7649d5b SHA512 12247730f202859c76b0a11ccc485de786e53df7b8e08ffd76d7653c25633d79387f027e7c9d804bf19cd89b9db047b7ca0cf1cf5e914ee74c6efc0b6660eb1d
+DIST pgpool-II-3.6.6.tar.gz 3171264 BLAKE2B b519d097366f190c4b6136643ccd839d1854ced0287ec1dc9f058dad1f7ebc18448d97d48338d03a8a7eafee49391381a8aa802fc14b84b757b133d6c97ec94e SHA512 02cfceed761cf6338ce0a33e9afe05194acdf4d5577cf0d920176cb3bacffce6e9c2c1e8a8b89c5b062bc53d54cd012a4ad9582b42df7bc36ee666dcd0ee3e10
+DIST pgpool-II-3.6.7.tar.gz 3188186 BLAKE2B b58561418e4027716614d6a70f5d844b8043312cb2a2b18882e0fdcd466e1f0624e43db7c67685227d808368388c6ee9dd0d5f3ea956d0585444b1e30bc49643 SHA512 4bc80f4b47f4b37e4efe1af137c2af076dc98c438bf094236223bba0facfaea91546a86d7604e67453b67e82a24ac5ee6e4325d81f90358a3a0d7a6c34acd7fc
+DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2
 EBUILD pgpool2-3.5.2.ebuild 2465 BLAKE2B 4e7d19f6ebdb02735cd58c00def5fa0b451e2878085235c5258952e18ee93e7ff21b4ba71441e100bb583530a424cd1094078cab5ac6a4c689c857b8e2c24fd9 SHA512 5f1d18669f16acdccda9eedb0a24d61705f9b9ea23130c95428ba1143ca337815e724047b9b41ee48ae7ae0599e329edd4a45ecc3ac428b95868d9990b4542bb
 EBUILD pgpool2-3.5.5.ebuild 2465 BLAKE2B d2c3ac6f7be204def3c7a7c9be6cf3aee43af6c340342197023f4001d078bdacbb0476195154989eeeb8cfa5d547d9e0a2a301bf553fbd08407a5a00bef07b49 SHA512 8cbe17265f1b698eca9386d1268dd3e07cc305efb0b4bd8cecd995656827bcb1db573094514d7f1e0b51a9a80effb70bffdc7c3c62f14fe974c468e2e3090926
 EBUILD pgpool2-3.6.1.ebuild 2396 BLAKE2B 5695231ccae6d373539da8fd54228ad1dcea17cae390a8b2b75d037fa26a5d02cfa0210a715deb2b2209daab1196f8ed574d832617adbe7c540113322021a574 SHA512 27b23a48947221074fee372c3c1708492796f1d0671d0f98272aa279c8021e491be182b7cf5f74e7ab7fa8a683a76539e60ad28ea89a79ed06984bc2e3920386
@@ -19,5 +20,6 @@ EBUILD pgpool2-3.6.4.ebuild 2502 BLAKE2B 14ca82a4af57366f226004f2956c9a1e2379862
 EBUILD pgpool2-3.6.5.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
 EBUILD pgpool2-3.6.6.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
 EBUILD pgpool2-3.6.7.ebuild 2488 BLAKE2B 221e4f4353405ed3027303429d9c2934bb42259d080fcabf7d1c764dbaf4f0ac2e8479426ff76b7d49bd00f4ca7ef107f9b297df55190b9ea830c8926ddc2b38 SHA512 84f54eadcc0500659d4b38314183eacfa3fa0a7e518cd354368beb96a6b1a6d6e5c9bf47abb601f2df33ccbe7f924dc51c5a20e1550090f09f625d6f59181630
+EBUILD pgpool2-3.7.0.ebuild 2491 BLAKE2B 90e8027d3108b82f0d6b498272d97f8730f1cd724ff53ca2364083bdb4034993d0e2342c0aa4752f9b2fda5a1772abaa226b2fd52fa4cb5e218b670ad15b5938 SHA512 05f8786371c119c9a4fb861e53908fc6682ef62cb7ceaf67bff9f07c8600b2536f07c3995a783f9f38916aca2e59850509dd1b733981ab95c23ad62acd63f70a
 EBUILD pgpool2-9999.ebuild 2440 BLAKE2B fcc37575bc095fe15b6176f351e86b97f5c5ea8385a3cd6100f3ebb4031e429b026b850c5c8b78770900e1d7fdee95e2e99190755c1b2a0204d2f37009d20bda SHA512 b2fd29cf9643d0cf093c64db9283dadcaa39fec6cca1ca8f1cb1cdd85265cbcca2fc30a52a041d2683328235c8717cead2083813f8b6365ad3465c620f0ec0a1
 MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/pgpool2-3.7.0.ebuild b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
new file mode 100644
index 000000000000..0b7ea3d06076
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-3.7.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{2..6} 10 )
+
+inherit postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="http://www.pgpool.net/"
+SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc memcached pam ssl static-libs"
+
+RDEPEND="
+	${POSTGRES_DEP}
+	net-libs/libnsl:0=
+	memcached? ( dev-libs/libmemcached )
+	pam? ( sys-auth/pambase )
+	ssl? ( dev-libs/openssl:* )
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	!!dev-db/pgpool
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	postgres_new_user pgpool
+
+	postgres-multi_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/pgpool_run_paths-3.6.5.patch"
+
+	postgres-multi_src_prepare
+}
+
+src_configure() {
+	local myconf
+	use memcached && \
+		myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
+	use pam && myconf+=' --with-pam'
+
+	postgres-multi_foreach econf \
+		--disable-rpath \
+		--sysconfdir="${EROOT%/}/etc/${PN}" \
+		--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+		--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+		$(use_with ssl openssl) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	# Even though we're only going to do an install for the best slot
+	# available, the extension bits in src/sql need some things outside
+	# of that directory built, too.
+	postgres-multi_foreach emake
+	postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+	# We only need the best stuff installed
+	postgres-multi_forbest emake DESTDIR="${D}" install
+
+	# Except for the extension and .so files that each PostgreSQL slot needs
+	postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	# Documentation!
+	dodoc NEWS TODO
+	doman doc/src/sgml/man{1,8}/*
+	use doc && dodoc -r doc/src/sgml/html
+
+	# Examples and extras
+	# mv some files that get installed to /usr/share/pgpool-II so that
+	# they all wind up in the same place
+	mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
+	into "/usr/share/${PN}"
+	dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
+	insinto "/usr/share/${PN}"
+	doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+
+	# One more thing: Evil la files!
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index f598f29ad93b..1e8a59b6f399 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,5 +1,7 @@
 DIST pspg-0.5.tar.gz 845824 BLAKE2B db7b36fbc644e1ac45906ba726212233c0a61230f609584d4fc6207576c4e350b926c6d93e2b9eb563340524e1dae7de0a0c846bed379143bb6a4fcb10cdfd0b SHA512 69e45885d4c155fc0e95360d442ac0b67fb910005148537dbd758e9a22ec83fb232214bf5f292b72a79be444ce05f2eb7bc0a2effaeb8731d1442a7f7ddec5df
 DIST pspg-0.7.4.tar.gz 846366 BLAKE2B 06a2927d326ba2f12661495b3a0133cdaf2b8c4edc624e87e285ae347850d654c345585471724521f6bea1f84cbfccef5ffef8971246b786675fc350c9de432c SHA512 403abe21230f760a43317b2d6be04a8cd6873f7ebb85037c3f4c12b7726ea491c6614bbe923f52dd863d3ebfba2e203f6a40c3fd6d13945663c4ae7b3091e0db
+DIST pspg-0.7.5.tar.gz 846741 BLAKE2B bfdc8c8edbacacb20b268e0577e571e9e2479563e94c7b1b345f0c0dab9e4b7beea97660260b8c99c6ef4524d5230024e5f453233a8418a159496758a3b64064 SHA512 4dc5fe3f2dc70d2d15021e7fb1fca9b870683dee4ab0a6b97bff06fecfe35fb57426440a6d73439210eb20bbe757d1e1a33e43f7ab040c1923527456aca2bbc8
 EBUILD pspg-0.5.ebuild 379 BLAKE2B 15673c16e78b8100002cc460dca4fd98bb40f06903eeda52a30f9718dee065e9d2eae7231dc263d7330176a8029a279068911c57b187071d3ed9887cb391dfe4 SHA512 1a6298a1cb317c198b8bf80f705bbe8fb7310ab0a17b3f8098639c4d880cbe86237aaa5b40f3a7d69f377d92f14c72944986194a7dceb4ceef410720be7fc3e3
 EBUILD pspg-0.7.4.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
+EBUILD pspg-0.7.5.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.7.5.ebuild b/dev-db/pspg/pspg-0.7.5.ebuild
new file mode 100644
index 000000000000..9b90eedb3e06
--- /dev/null
+++ b/dev-db/pspg/pspg-0.7.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index be8ccb24c579..9420a6d47c37 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 3bcba4dee97d..334eedc27f93 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,3 @@
-AUX avalon-logkit-1.2.2-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
 DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47
 EBUILD avalon-logkit-2.1-r8.ebuild 1413 BLAKE2B 45508e4a0b334959506546284b303d5afc5c83a8472d28a7b0107a74b09db1639492fcd872c54e93b93b302f149f8f46a7fb8684e7a45448ea01f59681c82ced SHA512 aecf4b592f090b545e71e50158e96b7d3a1450814d46a28976482337b075bb13315d2dbdd76360f29306ac4aefd8d07fb8b38f72b803ef42f4bcba0abe33eb7b
diff --git a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
deleted file mode 100644
index cb2611bf0de4..000000000000
--- a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
---- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java	2005-08-30 05:03:49.000000000 +0300
-+++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java	2011-09-27 08:27:49.313005212 +0300
-@@ -20,7 +20,9 @@
- import java.sql.Connection;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-+import java.sql.SQLFeatureNotSupportedException;
- import javax.sql.DataSource;
-+import java.util.logging.Logger;
- 
- /**
-  * A basic datasource that doesn't do any pooling but just wraps
-@@ -111,4 +113,16 @@
-     {
-         m_logWriter = logWriter;
-     }
-+
-+    public boolean isWrapperFor(Class cls) {
-+        return false;
-+    }
-+ 
-+    public Object unwrap(Class cls) throws SQLException {
-+        throw new SQLException("Not a wrapper for " + cls);
-+    }
-+    
-+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-+        throw new SQLFeatureNotSupportedException("Not a supported feature");
-+    }
- }
diff --git a/dev-java/saxon/Manifest b/dev-java/saxon/Manifest
index 560029ae5462..752c0bc7d0d5 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,7 +1,5 @@
 AUX 9.2-build.xml 2061 BLAKE2B fb4e505f9308caf2300b7a1159ff20a973576d974544b1be0b42b71566f8207af7ae48710522c4627bd4879ecfdf14f9f9b983802e6c98c4d1f00cdbc6a363e9 SHA512 9e7c02427041df22a7a5eddc6d9e709635493d079efaba66a9da6320af961d933176105028f8a96fef8f84599724829d582ff64d061d70364f048ed39308e67c
 AUX 9.2-edition.properties 74 BLAKE2B d468841c782fa7bf1b39cbeeac01d983a8d6891a13a97b2994496dd80e1c4e3cac893b35f813bccf4e0a877c7c3f1a6c5c12a9c6005b82efb2c42a70a49e93dc SHA512 2c95fc288bb35f68819edc95e8ce30f921b17196123ee7ce0c9908d210e8758c51204bc7dd222d6b7e4803dceb331bcd83120622fa2bcb6587d150a0f479ca02
-AUX build-6.5.5.xml 2087 BLAKE2B 350fe8f41d80b6dcd91f4f41618cf4611c172adbbff9daef17061d93398604da5c009804bbf72be3550a563701beed5eae30242579400e192d7a257be83169d7 SHA512 581a6fbd4af73849caa2a288efe9680f01163b56d8ab3c2f8739afcf07b72ba616ee9ea5456a1f7739ecfb38f4ae4d76f57fa3f99ce022551984568f36a6531b
-AUX build-8.4b.xml 4213 BLAKE2B 9f10d8e1acc4244e8faca2881eae878a9281cd9523d37ee7f87a0d42f29fb9c6e192d0d4b6d3a18a8695c4e31309ab626bef7223a691f62282ca6c2283b7e36f SHA512 7eb3c3136debefae6a66abfc0a199db403e72b397c5a7b0f0b2c30f6f697ffb828dbf7d9f3ac1c08d1965aa70c556eea10de0cb2adaada1ee46648e8f0075912
 DIST saxon6-5-5.zip 3346162 SHA256 a76806dda554edc844601d0ec0fb3d2a10a2f397eabf3569dfb44b628363afc4 SHA512 2d76ab6da8fc8ca8502139f6b620d4c9e94732a520083480e3936f6bd0a9f069252a7a05df53dab49aabec505764b2ec4ca1b36022bb56df568883a0491f495a WHIRLPOOL 11bd5242e2c82ac7467561946a0b3b35e53af48962906739136ce97561ca38fd950011a1f4a65cd597d2279af244c7b474707017108296c8deaee8fcecde7652
 DIST saxonhe9-2-0-6source.zip 2942625 BLAKE2B 45f9cc12591ebb94076392b16edba52811d911c41f2f197ffe864e37c1ef478670ff276b7dc8dff316dcd2986f777b4cc2d43989e5d300510ee0edfe7e54103d SHA512 6c59c0cbed905cf561387acb54bb31f0a251432deb0edf498ec4f4d9955bbcc12d1765ace594090d3ccb0416e3e72349466e430bb4f799b51fd12ce8fc5a144e
 EBUILD saxon-6.5.5-r2.ebuild 867 BLAKE2B a5879fbeb51e113e05dfbfe4dff8088e26621278c76f83cde4b47b6744cf83e9fb94fd25f661f25e57a3f8a5d513d903f3808dfb6fb6ba79d6e450cbccb03b5a SHA512 a8a6978c47998380b6c7ec09f7102584007aedd829cd95d0ff629d2df9062c5eb46ceecff88b2bb0fa575907810fb21fa14dc1253ff0da3f9962687935f53df1
diff --git a/dev-java/saxon/files/build-6.5.5.xml b/dev-java/saxon/files/build-6.5.5.xml
deleted file mode 100644
index bb866d07642a..000000000000
--- a/dev-java/saxon/files/build-6.5.5.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="project.name" value="saxon6.5"/>
-   <property name="pkg" value="${package.name}"/>
-   <property name="all.jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-	<path id="lib.classpath">
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
-	</path>
-
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" classpathref="lib.classpath"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <move file="${src}/META-INF" tofile="${build}/META-INF"/>
-      <manifest file="${build}/META-INF/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-  
-   <target name="jar-saxon6.5" depends="compile,manifest">
-      <jar jarfile="${dist}/${all.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-         <fileset dir="${build}">
-			<include name="com/**"/>
-			<include name="javax/**"/>
-			<include name="org/**"/>
-			<include name="META-INF/services/javax.xml.transform.TransformerFactory"/>
-         </fileset>
-      </jar>
-   </target>
-
-   <target name="jar" depends="jar-saxon6.5"/>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/saxon/files/build-8.4b.xml b/dev-java/saxon/files/build-8.4b.xml
deleted file mode 100644
index a3b6ebafbec7..000000000000
--- a/dev-java/saxon/files/build-8.4b.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="project.name" value="saxon8"/>
-   <property name="pkg" value="${package.name}"/>
-   <property name="all.jar" value="${project.name}.jar"/>
-   <property name="dom.jar" value="${project.name}-dom.jar"/>
-   <property name="jdom.jar" value="${project.name}-jdom.jar"/>
-   <property name="sql.jar" value="${project.name}-sql.jar"/>
-   <property name="xom.jar" value="${project.name}-xom.jar"/>
-   <property name="xpath.jar" value="${project.name}-xpath.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-	<path id="lib.classpath">
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
-	</path>
-
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-	  <mkdir dir="${build}/META-INF/services"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" classpathref="lib.classpath"/>
-   </target>
-
-   <target name="manifest" depends="init">
-	   <manifest file="${build}/META-INF/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-	  <echo file="${build}/META-INF/services/javax.xml.xpath.XPathFactory" message="net.sf.saxon.xpath.XPathFactory"/>
-	  <echo file="${build}/META-INF/services/javax.xml.transform.TransformerFactory" message="net.sf.saxon.transform.TransformerFactoryImpl"/>
-   </target>
-   
-   <target name="jar-saxon8" depends="compile,manifest">
-      <jar jarfile="${dist}/${all.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-         <fileset dir="${build}">
-			 <include name="net/sf/saxon/**"/>
-			 <include name="META-INF/services/javax.xml.transform.TransformFactory"/>
-			 <exclude name="**/dom/**"/>
-			 <exclude name="**/jdom/**"/>
-			 <exclude name="**/sql/**"/>
-			 <exclude name="**/xom/**"/>
-			 <exclude name="**/xpath/**"/>
-		 </fileset>
-		 <manifest>
-			 <attribute name="Main-Class" value="net.sf.saxon.Transform" />
-		 </manifest>
-	  </jar>
-   </target>
-
-   <target name="jar-saxon8-dom" depends="compile,manifest">
-		<jar jarfile="${dist}/${dom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-		   <fileset dir="${build}">
-				<include name="net/sf/saxon/dom/**"/>
-			</fileset>
-		</jar>
-   </target>
-
-	<target name="jar-saxon8-jdom" depends="compile,manifest">
-		<jar jarfile="${dist}/${jdom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-			<fileset dir="${build}">
-				<include name="net/sf/saxon/jdom/**"/>
-			</fileset>
-		</jar>
-	</target>
-
-   <target name="jar-saxon8-sql" depends="compile,manifest">
-	   <jar jarfile="${dist}/${sql.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-			<fileset dir="${build}">
-				<include name="net/sf/saxon/jdom/**"/>
-			</fileset>
-		</jar>
-   </target>
-
-	<target name="jar-saxon8-xom" depends="compile,manifest">
-		<jar jarfile="${dist}/${xom.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-			<fileset dir="${build}">
-				<include name="net/sf/saxon/xom/**"/>
-			</fileset>
-		</jar>
-	</target>
-
-	<target name="jar-saxon8-xpath" depends="compile,manifest">
-		<jar jarfile="${dist}/${xpath.jar}" manifest="${build}/META-INF/MANIFEST.MF">
-			<fileset dir="${build}">
-				<include name="net/sf/saxon/xpath/**"/>
-				<include name="META-INF/services/javax.xml.xpath.XPathFactory"/>
-			</fileset>
-		</jar>
-	</target>
-
-   <target name="jar" depends="jar-saxon8,jar-saxon8-dom,jar-saxon8-jdom,jar-saxon8-sql,jar-saxon8-xom,jar-saxon8-xpath"/>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api" classpathref="lib.classpath">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 13568781f40c..9a6f5cedb28c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 0bb7e3a96ab9..a267d71cb50f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -32,6 +32,6 @@ EBUILD python-3.4.6-r1.ebuild 10604 BLAKE2B cea6146a6b8643d1ba8def78647a83ee25bb
 EBUILD python-3.4.6.ebuild 10560 BLAKE2B 051327190be8d2db40cd485422334fd01b72f828632637b938f7d1e6967bc2c9e05c0a20b14b81b077f7250eb84f62ad4f7148653f51a85891315922ee4d1ecf SHA512 f16c395689916cc3d7b840343732de2fb4dfb62b996677e12ae8b50dbf95dd0e385c86f3a5e4049964d1ab67121556f7309bfddaad15b9e346dd3e9235813528
 EBUILD python-3.5.4-r1.ebuild 10665 BLAKE2B c5b306704319c0d72788a469b108c3adbee05eefc1a41e3c6383dc8ac743e19049ca85a118de91ed0a993f10b0fd1bc3e3d5c47b70029b876c9820f2525f1da2 SHA512 38c36ab3eab71e437fba80159ca76d407b60a6b810d71bfca7b37dec97f2926930df9e6190e8bd8da869289e1acf6c81cd3b4cc260a4b63c1cfb82c42ce2f261
 EBUILD python-3.5.4.ebuild 10612 BLAKE2B 2dbbc37b4afa20307b4e757c50a8188c135853ab5507e325d6ce0504f9d81326eb87c6bd3d0d92729edb73429b9ce3c81a10ee36fd5c2be9154bce0b9fa28dc2 SHA512 ebef78935b82db312a22a4d55ac2d38c23b3727774bfa6f4ab529493a8e60802d8135dd716764b0f2479cc988c6877ce1df4cfa43877a5802a15d9d442076977
-EBUILD python-3.6.3-r1.ebuild 10090 BLAKE2B f5929373350d72e14cf1387e06d63ea6df4bda7c39d161a7226085c6c4f221cdbcfb0566b04635048a9de0fb61cc05edd398b1b5efcdf78b8ce56f1138f9123c SHA512 947337723c460738548cd9e9924ca9c86174fef8062a893f8c602ffa9ef15999aabcc3011c266b1f3fba9d3796c681873e5f6c14424a591ef37ec5c595b19fb5
+EBUILD python-3.6.3-r1.ebuild 10089 BLAKE2B 110ebced7001de998877ddc0b6e2fbd65b720d77ed36ae11904011a77dd06c8e02cc40e15c70814fbad86102d2a97434f6f4d38809c1f476b8fb0e9fdcbbb460 SHA512 52fd7f2859179c6134674969fb485b4c020a87a2764b9b0ebd290ca007d85c13b169e71d2272660b532b8cd28b849ba7c647bc16d1e6814a4856e796959c32ae
 EBUILD python-3.6.3.ebuild 10053 BLAKE2B 2c989fdfa4a0c7a9df6878552c7b2784bfd08c44830e94bc7e6d0109db0d2d24dd9f47688eaf1843363152b06402eb0dae5a8261072ea72504337d72e25e07ce SHA512 46550bed736276975b6651bccf3246307626d09aee9831669a0e77b24ccc2d36e5d29909d39b06785354e0a0a6083722979f201d4338bfe66f3ad266b660e59c
 MISC metadata.xml 738 BLAKE2B 464af9b051fa52c8d7f632163a0ea51e356f79d5f0a2ba82c8ac70ef2ebf5ea489bb0d5371ebd954ee0d5b07fc86b8497be3aa2f660929eb09c4a0222a6cf704 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index 89d31741e873..3d9849571a91 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
-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 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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 50e2d5cee714..fb04a795bcf8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 8334c240bd8d..af099409eb9f 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,7 @@
 AUX beecrypt-4.2.1-build-system.patch 3796 BLAKE2B 2b89dcd9c8c06420100d9c59e75c07368705f853e3cfe1f301fb4c1c2246545d55ae64f10ced7b3a1d8772b5b8ce2ff1dac86a157b9f715fbe131ef3e98fb9cc SHA512 6f13707e238cd2602c1482554381fc4ffb59d367fc095453ae05c7bc17438552745b304ce2ad5c071a367a0a90809173682676a392396521e20006f214db0c46
 AUX beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch 734 BLAKE2B a0997dde4da38d681fc8cb2858eaf40e8e4ce6b90aafb0c53fb2b268cad41eefb8a0fce5d708bdd5509357ca77d52cec0dbbf2455f3498a08743db7ea37b53a9 SHA512 b6963a089587ecb495f097a890b57375f4580308f935424883ec0e694bf88848cded2e8108edc01f0887b6a8151437c94b7a2cd5bbdc48df151e16ea4755d2e4
+AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f5af4bbec8db5c87f7faefa381e8d973159f2b1a5e74189511eb43d200b7617cafd5cec18e23eaa69c99b68113fcf5998f SHA512 d344979022ea1e7ed2b7894bf9015996488cb5ec7c458aaad93a639ce457a1b790ba9e51b5369318566eb9ffc0df12d0b4108fd2997aa21c886dc079b836e973
 AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad156654dd79a2e380a0aaf48cd895d1308964a4dbc0ebcbbed978f78c066e4e480e193eeeb9b0e941828301256b0cabb SHA512 908d688ae29f23a3f67cb1ddf8d2f5277853abbf6fe291e371fa8595b8c6c5e4293c1c15b80171270639b9d4f092b4602bbd5144448c4f19ff958d5522edbc77
-DIST beecrypt-4.2.1.tar.gz 882758 SHA256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc WHIRLPOOL c4a0371d8e2cf37194800867c58e77d72bb59ab464fdff9c561230ece0f288dabdebfdd0ac13382c9ebe45b455ffbfdd81e6a15969dcb86d3d8c8e6635e294bb
-EBUILD beecrypt-4.2.1-r4.ebuild 2054 BLAKE2B 30e178a7d9abd163a206d175c6b54b5e4466a9e63e6978555d3e5c38228f6487b993a674cf78dd2badf7b792837b8d7b4e4398363e230bc71ec0c1b64e782c4e SHA512 b131f25372dec86dd22c57163a855d560db8b28a222711b40827e4b156c3469c8900fcc77386a36602068661cd0733e08358de52608aeafe656969bf6f59a289
+DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
+EBUILD beecrypt-4.2.1-r4.ebuild 2099 BLAKE2B 8ba4066a84105a8e6c90cf0baef87d96764eb89f611438b0fe8579d549003cc31ebde98519fdc77475ef46b5f143e10b040209ff9621cb0749d44e61f79526cb SHA512 34a7f2c9a0fb97b69b62db41e587872e80cac7d4b6733dd6084ff99cf53c5e7b213925abc53821fcd5a579bd40cdc07219e4a27315d6fef4f41161671f5fc809
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
index 4d835cb2cd94..69a3ccb8f34f 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 
 	# Fixes bug 596904
 	"${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch
+	"${FILESDIR}"/${P}-cast-uchar.patch #618676
 )
 
 pkg_setup() {
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch
new file mode 100644
index 000000000000..8efedc01e4aa
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-cast-uchar.patch
@@ -0,0 +1,214 @@
+beecrypt's c++ api uses jchar arrays for strings, while ICU 59 expects
+char16_t type
+
+In practice these both seem to be defined as short int on amd64 so it
+might be okay to just reinterpret_cast them? There's probably no easy
+way out on a platform where char16_t won't match jchar
+
+Patch by Valeriy Malov <jazzvoid@gmail.com>
+https://bugs.gentoo.org/618676
+
+--- a/c++/io/DataInputStream.cxx
++++ b/c++/io/DataInputStream.cxx
+@@ -201,7 +201,7 @@ String DataInputStream::readUTF() throw (IOException)
+ 		jchar* buffer = new jchar[ulen+1];
+ 
+ 		status = U_ZERO_ERROR;
+-		ucnv_toUChars(_utf, buffer, ulen+1, (const char*) data, (jint) utflen, &status);
++		ucnv_toUChars(_utf, reinterpret_cast<UChar*>(buffer), ulen+1, (const char*) data, (jint) utflen, &status);
+ 
+ 		delete[] data;
+ 
+@@ -232,7 +232,7 @@ String DataInputStream::readLine() throw (IOException)
+ 
+ 	array<jchar> target_buffer(80);
+ 	jint         target_offset = 0;
+-	      UChar* target = target_buffer.data();
++		  UChar* target = reinterpret_cast<UChar*>(target_buffer.data());
+ 	const UChar* target_limit = target+1;
+ 	      char  source_buffer[MAX_BYTES_PER_CHARACTER];
+ 	const char* source = source_buffer;
+--- a/c++/io/DataOutputStream.cxx
++++ b/c++/io/DataOutputStream.cxx
+@@ -187,7 +187,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException)
+ 	const array<jchar>& src = str.toCharArray();
+ 
+ 	// the expected status code here is U_BUFFER_OVERFLOW_ERROR
+-	jint need = ucnv_fromUChars(_utf, 0, 0, src.data(), src.size(), &status);
++	jint need = ucnv_fromUChars(_utf, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 	if (U_FAILURE(status))
+ 		if (status != U_BUFFER_OVERFLOW_ERROR)
+ 			throw IOException("ucnv_fromUChars failed");
+@@ -200,7 +200,7 @@ void DataOutputStream::writeUTF(const String& str) throw (IOException)
+ 	status = U_ZERO_ERROR;
+ 
+ 	// the expected status code here is U_STRING_NOT_TERMINATED_WARNING
+-	ucnv_fromUChars(_utf, (char*) buffer, need, src.data(), src.size(), &status);
++	ucnv_fromUChars(_utf, (char*) buffer, need, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 	if (status != U_STRING_NOT_TERMINATED_WARNING)
+ 	{
+ 		delete[] buffer;
+--- a/c++/io/PrintStream.cxx
++++ b/c++/io/PrintStream.cxx
+@@ -191,7 +191,7 @@ void PrintStream::print(jchar ch) throw ()
+ 			UErrorCode status = U_ZERO_ERROR;
+ 
+ 			// do conversion of one character
+-			size_t used = ucnv_fromUChars(_loc, buffer, 8, &ch, 1, &status);
++			size_t used = ucnv_fromUChars(_loc, buffer, 8, reinterpret_cast<UChar*>(&ch), 1, &status);
+ 			if (U_FAILURE(status))
+ 				throw IOException("failure in ucnv_fromUChars");
+ 
+@@ -268,14 +268,14 @@ void PrintStream::print(jlong x) throw ()
+ 
+ void PrintStream::print(const array<jchar>& chars) throw ()
+ {
+-	print(chars.data(), chars.size());
++	print(reinterpret_cast<const UChar*>(chars.data()), chars.size());
+ }
+ 
+ void PrintStream::print(const String& str) throw ()
+ {
+ 	const array<jchar>& tmp = str.toCharArray();
+ 
+-	print(tmp.data(), tmp.size());
++	print(reinterpret_cast<const UChar*>(tmp.data()), tmp.size());
+ }
+ 
+ void PrintStream::println() throw ()
+--- a/c++/lang/String.cxx
++++ b/c++/lang/String.cxx
+@@ -33,6 +33,8 @@ using namespace beecrypt::lang;
+ #include <unicode/ustdio.h>
+ #include <unicode/ustring.h>
+ 
++static_assert(sizeof(jchar) == sizeof(UChar), "jchar and UChar sizes mismatch");
++
+ String::String(array<jchar>& swapWith)
+ {
+ 	assert(swapWith.size() <= Integer::MAX_VALUE);
+@@ -56,7 +58,7 @@ String::String()
+ 
+ String::String(char c) : _value(1)
+ {
+-	u_charsToUChars(&c, _value.data(), 1);
++	u_charsToUChars(&c, reinterpret_cast<UChar*>(_value.data()), 1);
+ }
+ 
+ String::String(jchar c) : _value(&c, 1)
+@@ -67,7 +69,7 @@ String::String(const char* value) : _value(::strlen(value))
+ {
+ 	assert(_value.size() <= Integer::MAX_VALUE);
+ 
+-	u_charsToUChars(value, _value.data(), _value.size());
++	u_charsToUChars(value, reinterpret_cast<UChar*>(_value.data()), _value.size());
+ }
+ 
+ String::String(const jchar* value, int offset, int length) : _value(value+offset, length)
+@@ -449,7 +451,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str
+ 		if (U_FAILURE(status))
+ 			throw RuntimeException("ucnv_open failed");
+ 
+-		int need = ucnv_fromUChars(loc, 0, 0, src.data(), src.size(), &status);
++		int need = ucnv_fromUChars(loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 		if (U_FAILURE(status))
+ 			if (status != U_BUFFER_OVERFLOW_ERROR)
+ 				throw RuntimeException("ucnv_fromUChars failed");
+@@ -458,7 +460,7 @@ std::ostream& beecrypt::lang::operator<<(std::ostream& stream, const String& str
+ 
+ 		status = U_ZERO_ERROR;
+ 
+-		ucnv_fromUChars(loc, out, need+1, src.data(), src.size(), &status);
++		ucnv_fromUChars(loc, out, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 		if (U_FAILURE(status))
+ 			throw RuntimeException("ucnv_fromUChars failed");
+ 
+--- a/c++/lang/StringBuffer.cxx
++++ b/c++/lang/StringBuffer.cxx
+@@ -35,7 +35,7 @@ StringBuffer::StringBuffer() : _buffer(16)
+ 
+ StringBuffer::StringBuffer(const char* s) : _buffer(16 + strlen(s))
+ {
+-	u_charsToUChars(s, _buffer.data(), _used = strlen(s));
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s));
+ }
+ 
+ StringBuffer::StringBuffer(const String& s) : _buffer(16 + s._value.size())
+@@ -53,7 +53,7 @@ StringBuffer& StringBuffer::append(char c)
+ 	synchronized (this)
+ 	{
+ 		core_ensureCapacity(_used+1);
+-		u_charsToUChars(&c, _buffer.data() + _used++, 1);
++		u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1);
+ 	}
+ 	return *this;
+ }
+@@ -88,7 +88,7 @@ StringBuffer& StringBuffer::append(const char* s)
+ 		jint need = strlen(s);
+ 
+ 		core_ensureCapacity(_used + need);
+-		u_charsToUChars(s, _buffer.data() + _used, need);
++		u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need);
+ 
+ 		_used += need;
+ 	}
+--- a/c++/lang/StringBuilder.cxx
++++ b/c++/lang/StringBuilder.cxx
+@@ -38,7 +38,7 @@ StringBuilder::StringBuilder() : _buffer(16)
+ 
+ StringBuilder::StringBuilder(const char* s) : _buffer(16 + strlen(s))
+ {
+-	u_charsToUChars(s, _buffer.data(), _used = strlen(s));
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data()), _used = strlen(s));
+ }
+ 
+ StringBuilder::StringBuilder(const String& s) : _buffer(16 + s._value.size())
+@@ -55,7 +55,7 @@ StringBuilder& StringBuilder::append(char c)
+ {
+ 	ensureCapacity(_used+1);
+ 
+-	u_charsToUChars(&c, _buffer.data() + _used++, 1);
++	u_charsToUChars(&c, reinterpret_cast<UChar*>(_buffer.data() + _used++), 1);
+ 
+ 	return *this;
+ }
+@@ -97,7 +97,7 @@ StringBuilder& StringBuilder::append(const char* s)
+ 
+ 	ensureCapacity(_used + need);
+ 
+-	u_charsToUChars(s, _buffer.data() + _used, need);
++	u_charsToUChars(s, reinterpret_cast<UChar*>(_buffer.data() + _used), need);
+ 
+ 	_used += need;
+ 
+--- a/c++/security/Provider.cxx
++++ b/c++/security/Provider.cxx
+@@ -90,7 +90,7 @@ Object* Provider::setProperty(const String& key, const String& value)
+ 
+ 			UErrorCode status = U_ZERO_ERROR;
+ 
+-			ucnv_fromUChars(_conv, symname, 1024, src.data(), src.size(), &status);
++			ucnv_fromUChars(_conv, symname, 1024, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 
+ 			if (status != U_ZERO_ERROR)
+ 					throw RuntimeException("error in ucnv_fromUChars");
+--- a/c++/security/Security.cxx
++++ b/c++/security/Security.cxx
+@@ -104,7 +104,7 @@ void Security::initialize()
+ 
+ 					const array<jchar>& src = value->toCharArray();
+ 
+-					int need = ucnv_fromUChars(_loc, 0, 0, src.data(), src.size(), &status);
++					int need = ucnv_fromUChars(_loc, 0, 0, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 					if (U_FAILURE(status))
+ 						if (status != U_BUFFER_OVERFLOW_ERROR)
+ 							throw RuntimeException("ucnv_fromUChars failed");
+@@ -112,7 +112,7 @@ void Security::initialize()
+ 					char* shared_library = new char[need+1];
+ 
+ 					status = U_ZERO_ERROR;
+-					ucnv_fromUChars(_loc, shared_library, need+1, src.data(), src.size(), &status);
++					ucnv_fromUChars(_loc, shared_library, need+1, reinterpret_cast<const UChar*>(src.data()), src.size(), &status);
+ 					if (U_FAILURE(status))
+ 						throw RuntimeException("ucnv_fromUChars failed");
+ 
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 6e87a8e94f48..e454a2d4248f 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,6 +8,6 @@ DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5
 DIST beignet-1.3.2-source.tar.gz 1143573 SHA256 c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a WHIRLPOOL 5d1c48bce9e8ffb4928baebce80d5bc50cb6ffb5a6d5f144b7e7258b9d42bdb995a604f98d5d942ef6edea636ba7cd7308b7156b00c9234772d1c1fc597ece02
 EBUILD beignet-1.3.1-r1.ebuild 2473 BLAKE2B aa562dcc1164162dddd40baedb85f1a683330d9371d9269c8fed913a5ee865725821086dbc40e7013274ac7fb346a836830253ea48885a174c91b9d875a40b94 SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148
 EBUILD beignet-1.3.1.ebuild 2468 BLAKE2B 8f35c89e9d5510ba4c93eafe2df0d0913a571603e9df705974916b90409294a0b08ff0d56e692a98ecc2bb4a6bf69dfbfaf300f23a9eb9d0b75590405fd35147 SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c
-EBUILD beignet-1.3.2.ebuild 2436 BLAKE2B 003521051c05fd307138c1fa13e41e191f233326bfcc4d6e1ccace195797f22c264b4ef1e07f6bced63cef5839fba4b39991432ad77b1434b44853e8fe5022a6 SHA512 7a883e250b12a816795c74718e3cbf0866453022bfa4779da29475574f15ad730e394048c42825991140ceeb9e990cfffdab569ec9d6518cfcf2742b85aaf934
+EBUILD beignet-1.3.2.ebuild 2555 BLAKE2B d8021b67f93b5d9d387e8f1de4dffea47a88a85a16a18448ff55686ff0130ecbb1b32a3fee53250f0263173baedc19dfa7805a53781dab7b5c7466d8bd910dae SHA512 686671fbd4062aa3127b865289a7f75d78988d084ce07fa38a308168eb03594a1390ee7e96e292b776032745411a6789f3a82f9cf0cfedd937e2dfe1ed950e68
 EBUILD beignet-9999.ebuild 2448 BLAKE2B a35f0d38ff5f4c7c404b5d980b2762fb0e0aee9cfbfef1fe5d573ca9d54d8ed5ba5701355ebcf963d6736f2883577b06c4987d3b8eb8c5b078079a72b8377dfc SHA512 32dfb4b910f7bd7d7f1ccddd64b452850c8cd63f9e15f08a1ae2f747ae1c0986dbbfba0be8d6c4b2a08a3f3a24b6ee8fc04c0b02c45281674fe17114a1ef7b11
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 9b6fbba591aa..e70e9d24d2a5 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -25,12 +25,12 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
+COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+	sys-devel/clang:=[${MULTILIB_USEDEP}]
+	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
 RDEPEND="${COMMON}
 	app-eselect/eselect-opencl"
 DEPEND="${COMMON}
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 9fc85003f13b..ed0782ea4d00 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,7 +2,7 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 AUX botan-2.3.0-build.patch 1433 BLAKE2B 125c79ede4b803ff444f3e5f3b381e75140174b21aa694b4746c548b787ca4f83fd12e4fc5307bb700e48aa82d6b9ca2e7d17b9082b3f85f60a14b8c26d7fdc3 SHA512 b62758505ec7f6b8cd62a6891c3c721fc5499e529c44f55600f1bb7572d58d2f1707b3d88bde4c8b6eb715b80fb60fdd09ae233c6586df3aeb2146934cfa07a2
 DIST Botan-1.10.17.tgz 2706678 SHA256 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613 SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 WHIRLPOOL b2d82fb18ad7f69e26325c797cee939f65211e3b09c7058881633d410acd88e1839960c4be65637b00714b19d06a1c181704a5d184c1890cd7ee75b0e90a301b
-DIST Botan-2.3.0.tgz 5947072 SHA256 39f970fee5986a4c3e425030aef50ac284da18596c004d1a9cce7688c4e6d47c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a WHIRLPOOL 295965db5d6d0f21511a6a49f79a80cc7adffb8c67e05c6c09081eae233e2bb5abe506147a7e84ded9ddd1e29faba3276527449da3484e0b07e8bdc03018e211
+DIST Botan-2.3.0.tgz 5947072 BLAKE2B b8eaf4228c01200f839031b423901f93c1b6863d10424ad52afeac85131e95bc1bad024478c8e4c8e4c12210e85aa62d30fb83b3ece8facdb57763f95c45687c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a
 EBUILD botan-1.10.17.ebuild 4215 BLAKE2B b4d1e16b4ed8ab4f8dfba08312c26b744896a59b3eaeed8df784ffd1ef8d81233eaf841270fa0e761ae9491797aa2ae965d4a8f0704140c5761263103fe856e1 SHA512 a8134be2cb93db31e468c7b1dc3559cbd6e54c32d36848df4597da7a49ca8d8d027ff9695393d6902e06dbdf101eac1ef55542bef366ce8ed334f2a7fe8e4b0c
-EBUILD botan-2.3.0.ebuild 2784 BLAKE2B 2b1cadf3fe5487103105d411245a7f3c29a1b5d3da347738fdc08e3d744a7656231074abb3544b21fa0c2458986cc4348c12daf0c1e8c949f4bdfde0353cdeef SHA512 518e88870f890d56678fdf1890930fc0eea7230fbe843f8c7b7f05ca992cc05d86a1b8ffc1857d75ae6423a8bcd28d6aac9def0ca7a517270135f26f0152621e
+EBUILD botan-2.3.0.ebuild 2783 BLAKE2B c65f5c4b2c84305bb10bf38439e34b25545d6ff7c06be17fcf276c87b4513b353d713075de183c92c701f9b161c949be081e5b874ac31b9b87917b04050d1092 SHA512 49471ee62fdc03e9a058ba90b7e2260b8bee4cad677d804a35ccf4e22d2179220497e0cc47733d80974f7af686ae10a68164babc27586e0ebd155d7b32526a45
 MISC metadata.xml 675 BLAKE2B 20c2dc44426b9e2c7d57f45b5838b0ca27d80e6cbef49471cfe1cafb3c5db47ec3f243736856550bda25fd21e12fef08a71f6db7d855a025a3f4133fd2b5a1d7 SHA512 6773167b2e46f8d2251d369bd668a2ea309ce3b874166ebd102c7758f1f23a215f47d6581999d49325e9fdda88082ab46db8dc4f98ad6a20722f50a56b474b39
diff --git a/dev-libs/botan/botan-2.3.0.ebuild b/dev-libs/botan/botan-2.3.0.ebuild
index b48e00ca7831..d715da51c97e 100644
--- a/dev-libs/botan/botan-2.3.0.ebuild
+++ b/dev-libs/botan/botan-2.3.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/3" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 9fcc757e8649..0e4122bce4f3 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,13 +1,11 @@
 DIST libinput-1.6.2.tar.xz 929180 SHA256 96fc0e0b24a96042b16e561201979dfa4a3f00a642538195c62f72b79f4084fa SHA512 f1e1436ec4259ebddf93a50fe4d39a52713efd246a39a072b44bf296a413bdadbb789d6a4f0107ed3eb37afe34a37a43c9e75dcf814462385011eff2d3f42db7 WHIRLPOOL e9ed43ab8efb5b984a8c431e82880a691f7c94577a7a3789cf1e52c82f8aeee70d56474895a349f286f4d7fc845be8302ca7432b8e4801a6233fbe96b0078db3
 DIST libinput-1.7.3.tar.xz 922464 SHA256 096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b WHIRLPOOL 06ea9038f7b3127b3238fc863b1ec862647a08b1ab4956fcfd433093dc3c68585ba3b166515370681ed158a48ce6a5670c6b8dcb6d536af25f8bda2c84c74286
 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
-DIST libinput-1.9.1.tar.xz 456772 SHA256 f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8 SHA512 e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 WHIRLPOOL 3a2b679d5d0f1671281fd689a842ccca1f1750f5af6d004d767364daaf17edc7dd8ec17413f1c05c28d162d03036a2719ac2db02bd253f051a9f82c6a667698d
 DIST libinput-1.9.2.tar.xz 460388 SHA256 dd6853241ffe1f1d83b5a375a2f1c17b2901fdbba5d302c67987cc0f4101de3b SHA512 99719ab26be8ed35937ce91307459fa8c4aa7c383a555f1012a058ba98ca1d1c5df0d9b5e6a45046341c6dbae496dc29512b487ac7873b6ec67cab1176ee04ac WHIRLPOOL fdb281e7a0fdf4bb3feca06c7baaa3f9095265b6e65ed810a20f98e9aac2a89f7f740375296fd0ff9209475d548aa0d3ffcac8b8607c9fea7d7298af487bb682
+DIST libinput-1.9.3.tar.xz 473724 BLAKE2B 2cad3514f2e04505f015a8d105eaecb9ffb93ce57ccc2b035e5e031f72d278d966bae16fd804e7f315d0d651021567b2118fc9e53ee64d91e6e34cec6b92a8cf SHA512 33fb17724d4c2992bf31f9bb2e0825955468058e122ad420678b01ee293e1651d659fbae8873a7913f571243b3618032774cd350d2513eb73320d40aaa9953d1
 EBUILD libinput-1.6.2.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.7.3.ebuild 1536 BLAKE2B 2bc976665faea4481d62be67e47a21d483d3652b929bc153aae5cb4dc1ebcaa7937944bc1e5aabc40a2e30fb8be8e81d135dc59770049e0c7f95b4e2e6023660 SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
-EBUILD libinput-1.9.0.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
-EBUILD libinput-1.9.1.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
 EBUILD libinput-1.9.2.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
+EBUILD libinput-1.9.3.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.9.1.ebuild b/dev-libs/libinput/libinput-1.9.1.ebuild
deleted file mode 100644
index 89bf24d7c505..000000000000
--- a/dev-libs/libinput/libinput-1.9.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 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/libinput/libinput-1.9.0.ebuild b/dev-libs/libinput/libinput-1.9.3.ebuild
index 89bf24d7c505..89bf24d7c505 100644
--- a/dev-libs/libinput/libinput-1.9.0.ebuild
+++ b/dev-libs/libinput/libinput-1.9.3.ebuild
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 68d23ae7250e..6418bf10ff5f 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -1,15 +1,9 @@
 AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab71b52964622d66ef43a0ca2c7ee8e6e0e9128b7863a465bb887ac300a8cfc1f6efcdb740fdd88ed36cd465b75 SHA512 905c5f1dc22b665ef8910b6319b25e1d1e9dd80892c03c6c71de597599d8ce2972b35d92e6976ad8798d2f10927e3e884570246d5d8162e84dc3e1f963959012
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
-AUX libmemcached-1.0.17-gcc4_8.patch 9467 BLAKE2B 6de357401207dfece0f1f87361fbfea157f63b93275905d460f987a729c947c3afb084dc055ce3ccd2732a4dcf8da49e8feba07c6ac433c7e87b7116b186d7bd SHA512 7aaed25fef7abde531dc1ca1f86b946e2b3277abe582257dae24650546d42dae499a5c8cae9ed84c3a189d42921ce50f42d06efbe2bba0af0b739e7b1ac5ad21
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
-DIST libmemcached-0.50.tar.gz 884272 SHA256 d3ed82f9c5cdfa816047ed6b7475b5708f9040b5cf3d9e2aed55de235e8b2f9a SHA512 f06a17b365779eb8fb0c94982e5141643ed17f91e5137565ff756912cf96b3f68b11a643f84d0cba1b474411f16a64086cc311ac5cea4bc3792da81b40d423b7 WHIRLPOOL fc1d3107772a45e844764c570261ccd2556ff11b770377c84788cc3d8a8ee946a8e5b3527c21e70c1c5aa1d9493270d9079f8a75cd5387835ccd7def1cab0f9e
-DIST libmemcached-1.0.14.tar.gz 1000929 SHA256 32eaea2c4b8965a12bd33fe1af043d7e20b7ec64977937973a3d97514f1e946b SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b WHIRLPOOL be3760f75a6de33687272b5bf7be950edb0a3f96184c7f8f7e1cb47ff85479ea76c277f298d36f21a5f15c1ce8e04a0714f1bf73700711842bb4c0841959674a
-DIST libmemcached-1.0.17.tar.gz 1023177 SHA256 7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5 SHA512 7cc2a836524a628f4617bad12e8ea3b0192a3f8530a3588a076daac56b3e773d7d36823091a81d6447da9fe9d017849c59dbbcc65190ff9817bb985dc6c11a3b WHIRLPOOL 34b57811750667bca59efa5a4356a15dd2bd0135534c1d157df4b3d9ff3575db1848f363914ee1b6b606a45dae3145985c791f11ae5890a7493207cb2e9eb3b4
-DIST libmemcached-1.0.18.tar.gz 1039649 SHA256 e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585 WHIRLPOOL f7d8f405306fd7cbfee6ba8b340305bc79b1dbcd6a2a2dcb0ee74a24d8928e5a5a7f0d20afebf58cecf44e7ca3fd66abd2d30041848b89ddbb10eb1da9179b94
-EBUILD libmemcached-0.50.ebuild 1691 BLAKE2B 1de2a34c365944a93d28af3c295e250964c68691c02cc67ff16f64f9a2e3bc4b28579c5686ed555f6b045406af62ae718e7821266a065de83038c7814e40951a SHA512 780d968506f3898820c06914b3b3e9b269f2ef5b80331c1a34a6351c36cbfddbcdedc23436ee9ed23bfb333be56768df874d4563f0bc7ace9437de712d332efc
+DIST libmemcached-1.0.14.tar.gz 1000929 BLAKE2B 6dfef0fa5714e6383514ff28d3eb75740f30f7adce4e4c0ea4c26a6667fc6cfa5df84e0c52b47393d156e9a8e5de0409699b47d77128a400f64f37b981977dbb SHA512 4c0371cc4752eeee94baad6063b2413f096b5050166ce761ac26080559537dab32b69131a97703fdebf8f4886520d4bc29c7d4d8d1df6d0d681c81b88354c15b
+DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
 EBUILD libmemcached-1.0.14.ebuild 1141 BLAKE2B b0d6b34378e4232b176499157a38c4054c0bcd7e2de8381a590b2623e631a8766490ae487f103720ee8fddcdc8c069b8a05ddb957a36b4a686ba6c187ac9a7e8 SHA512 3ae6c31505deca27858613d40168012e8ced46262f41ce8fab7ff822b2255944e1bee8646800fb54325aeacbbc6227e05879ae6448f5d4527aa4e6bb1c8a6257
-EBUILD libmemcached-1.0.17-r3.ebuild 1383 BLAKE2B d0470863f4c5b1f3fd6d8c06e753cb80799f0ad28147b11bf3706df242c308ed181642928b8fbabe6d873165780b2e4578cf2642c128ccfb74c53a2094ae9997 SHA512 af7fc1c3350b1ae6688cc32cc78084cbbf7e1d839f042292189621b510fd9f616cb7fbee7f84df216dcc5ce1e862b285cb03be6c7e7e8d9b4d813cca83e89d64
-EBUILD libmemcached-1.0.17-r4.ebuild 1426 BLAKE2B 27213c86edcbf06334101471ebdeae17dc60fd7129f653171a6dd1dd68daeba61057ae8fca32be45c3f0bd8c4672001398233daaf80768fc6814eb20a10728f0 SHA512 b011e26ad29f9d1c6a0a6791d15811a138fb9d3e6799edd7e64a34182717a05018c4efc3fb29a24283ccfada99b90f77a1caa17ad466ba49d94c9413368a5af4
 EBUILD libmemcached-1.0.18-r1.ebuild 1528 BLAKE2B fc33e62cd363d2d87f97078fe57f1f5085782428201db29b952babaa2899e330fd8d7b14727de0c1fb5077e2dc11a077a4e06ebaaa4c217b41690156eb320fd3 SHA512 e5043ffabbe07b7d9b98c1bf2411d705f99046fb8c1133eaa80a65e2e51cc97274b6568b167e4f720e983977f703daf067faad0fcf94f5a79f120bb8fc560b84
 EBUILD libmemcached-1.0.18-r2.ebuild 1548 BLAKE2B c4092143293265b13b66a4ff6905df79b889f418551eb62b5dea92a4f9666c4ac31b563ec7355cb374d5a798b2e3a6bf3b91e4088dee006c414a3a53071cd2ae SHA512 d335f33d1d7137283c10a39d9913fcfa5cb3e69c264ceba527fa54863adc680561406c69c3b29173bac42aad4d7d9e1971aed7f9890d698c75746a8f8fb99a49
 EBUILD libmemcached-1.0.18-r3.ebuild 1622 BLAKE2B 4df5c628025f721bc447a9059972218e924ad83d18e3bf4f606e8ebbd681eb06e142c33795cb8a864e69d3d06161cd492d3ecb6d222882e1d0e2117c59a51b0e SHA512 440fb952134caaf031e12252991c8fed6595b2a4dca158a94253a0075558251b3bc6ad0f2db42317418b3d4071f46357b35cd516a7d0c47c59609ae477d3c072
diff --git a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch b/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
deleted file mode 100644
index 5f42d3f3cabd..000000000000
--- a/dev-libs/libmemcached/files/libmemcached-1.0.17-gcc4_8.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Description: Fix compilation with gcc-4.8
- This patch fixes the error flags made incompatible with gcc-4.8:
- g++: error: -fsanitize=address is incompatible with -fsanitize=thread
-Author: Brian Aker
-Last-Update: 2013-06-14
-Bug: https://bugs.launchpad.net/libmemcached/+bug/1164442
-
---- a/libtest/run.gdb	2012-03-26 01:08:09 +0000
-+++ b/libtest/run.gdb	2013-04-10 05:25:24 +0000
-@@ -1,5 +1,6 @@
- set logging on
- set logging overwrite on
- set environment LIBTEST_IN_GDB=1
-+set ASAN_OPTIONS=abort_on_error=1
- run
- thread apply all bt
-
---- a/m4/ax_harden_compiler_flags.m4	2013-02-12 05:44:21 +0000
-+++ b/m4/ax_harden_compiler_flags.m4	2013-04-10 05:25:24 +0000
-@@ -53,7 +53,7 @@
- # ?  _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long]) -- Don't turn on for
- # compatibility issues memcached_stat_st
- 
--#serial 8
-+#serial 9
- 
- AC_DEFUN([_WARNINGS_AS_ERRORS],
-     [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
-@@ -92,9 +92,12 @@
-            _APPEND_COMPILE_FLAGS_ERROR([-H])
-            _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
-            _APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
--           [_APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O0]),
-+           _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+           ],[
-+           _APPEND_COMPILE_FLAGS_ERROR([-g])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O2])
-+           ])
- 
-          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-            [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
-@@ -155,26 +158,31 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunsafe-loop-optimizations])
-           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-+            AS_IF([test "x$enable_shared" = "xyes"],[
-+                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-+                ])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          ])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
-@@ -186,6 +194,7 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
-           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
-+          _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
- 
-           AS_IF([test "x$ax_enable_debug" = xno],
-             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-@@ -213,9 +222,12 @@
-            _APPEND_COMPILE_FLAGS_ERROR([-H])
-            _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
-            _APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
--           [_APPEND_COMPILE_FLAGS_ERROR([-g])
--           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O0]),
-+           _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+           ],[
-+           _APPEND_COMPILE_FLAGS_ERROR([-g])
-+           _APPEND_COMPILE_FLAGS_ERROR([-O2])
-+           ])
- 
-          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-            [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
-@@ -268,27 +280,32 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-funsafe-loop-optimizations])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
- #         _APPEND_COMPILE_FLAGS_ERROR([-Weffc++])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
--          _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
--#          _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
-+          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[
-+            _APPEND_COMPILE_FLAGS_ERROR([-fno-omit-frame-pointer])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=address])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer])
-+            AS_IF([test "x$enable_shared" = "xyes"],[
-+                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=thread])
-+                ])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=memory])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=alignment])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bool])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=bounds])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=enum])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-cast-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-+            _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
-+          ])
-+#         _APPEND_COMPILE_FLAGS_ERROR([-Wold-style-cast])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wclobbered])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
-           _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
-@@ -301,6 +318,7 @@
-           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
-           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
-           _APPEND_COMPILE_FLAGS_ERROR([-pipe])
-+          _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
- 
-           AS_IF([test "x$ax_enable_debug" = xno],
-           [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-
diff --git a/dev-libs/libmemcached/libmemcached-0.50.ebuild b/dev-libs/libmemcached/libmemcached-0.50.ebuild
deleted file mode 100644
index 1f9bf894d977..000000000000
--- a/dev-libs/libmemcached/libmemcached-0.50.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils multilib
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://tangent.org/552/libmemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug doc hsieh +libevent sasl static-libs tcmalloc"
-
-DEPEND="net-misc/memcached
-		virtual/perl-Pod-Parser
-		doc? ( dev-python/sphinx )
-		libevent? ( dev-libs/libevent )
-		tcmalloc? ( dev-util/google-perftools )
-		sasl? ( virtual/gsasl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# These tests freezes for me
-	sed -i -e "/connectionpool/d" \
-		-e "/lp:583031/d" tests/mem_functions.cc || die
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		--disable-libinnodb \
-		$(use_enable debug assert) \
-		$(use_with debug debug) \
-		$(use_enable hsieh hsieh_hash) \
-		$(use_enable libevent libevent) \
-		$(use_enable tcmalloc tcmalloc) \
-		$(use_with sasl libsasl-prefix) \
-		$(use_with sasl libsasl2-prefix) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake || die
-
-	if use doc; then
-		emake html-local || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.* || die "Install failed"
-	newman docs/man/memdump.1 memcached_memdump.1
-	if use doc; then
-		dohtml -r docs/html/* || die
-	fi
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
deleted file mode 100644
index a9cd9f3a1fdd..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.17-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild b/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
deleted file mode 100644
index 4e98e815134e..000000000000
--- a/dev-libs/libmemcached/libmemcached-1.0.17-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib
-RESTRICT="test" # https://bugs.gentoo.org/show_bug.cgi?id=498250 https://bugs.launchpad.net/gentoo/+bug/1278023
-
-DESCRIPTION="a C client library to the memcached server"
-HOMEPAGE="http://libmemcached.org/libMemcached.html"
-SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug hsieh +libevent sasl static-libs"
-
-DEPEND="net-misc/memcached
-	sasl? ( dev-libs/cyrus-sasl )
-	libevent? ( dev-libs/libevent )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i '6i CFLAGS = @CFLAGS@' Makefile.am
-	epatch "${FILESDIR}/${PN}-1.0.17-gcc4_8.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dtrace \
-		$(use_enable static-libs static) \
-		$(use_enable sasl sasl) \
-		$(use_enable debug debug) \
-		$(use_enable debug assert) \
-		$(use_enable hsieh hsieh_hash) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	# remove manpage to avoid collision, see bug #299330
-	rm -f "${D}"/usr/share/man/man1/memdump.*
-	newman man/memdump.1 memcached_memdump.1
-}
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index fc30f30b59e0..a2648e70f8d1 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,8 +1,6 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 SHA256 8ea0dfd606b0ac280747c9a5f93ca940c23c7367dee0776715c87623ae6624fb SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313 WHIRLPOOL 209cb5a81003eac9952a771a0afc08073f242566e28d378432a0f172b8b195ccfc03b1a8f85949f1d22063c1519afd48b6263de7e4403a14c365de94d5f8f83e
-DIST libmowgli-2.0.0.tar.gz 200771 SHA256 7c5a94082899d055fc9a02b94e2658b42616fdb98e58e9a71165c07b6f5cceba SHA512 efccd93824c116fa8440f1d327382997f7d752d007dc9fad650ef1935fe0cee1a3fa1c645442a3f3f0f6d9f2916f66882e537a1692c494303fc0bf062df51e3a WHIRLPOOL 75c5698e1ccc5e1895d8d5f35d00347ceaf5424a621ecae399ebfe6537bf591edc21d0e42f7923704e3c857cc7349447d514605bb1d3e0e78f136e530933e8ed
 DIST libmowgli-2.1.3.tar.gz 227742 SHA256 b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477 SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533 WHIRLPOOL d22e33fa4741282779f2ae341e5cdd3ecf18a5d9812e708a5ddd0df51f7a30fdc5b4c8f611187f894d2975f9a013d8f841268be75369abba56407a9d66c50d7f
 EBUILD libmowgli-1.0.0.ebuild 592 BLAKE2B 8ecd3367a72255f72f4d1f33898fdcb6f6e668d1b6ff04866b2f8eca7660d508ca17e7f175da3b32e37d99dc7f21eafe26bfcd5ce5a3715d2bbcc6e74a316209 SHA512 9d9ea4ee4239c5c8be7fa37e653afc06a7d61fd2561b6dc7940e39af689cc1e6f64ac774ef00c6f2c3c8a95b6d47fc41c5d5ed64fecb7472b74b6e2ae2169567
-EBUILD libmowgli-2.0.0-r1.ebuild 801 BLAKE2B 1a50bf356ba9dfc4bbdae5eb26432fdbf19ff9b10526766dceacbf89638d7b9a7fcb7a25779ed18f4e3a00c938b16919a4e03eff6fde5a0ada81de508491697d SHA512 5dd401336088ef6fd66cfd62bb5da31885e13030d67825e636c84c8ac72fd07e595ede030b0449d7b9433469bb279145ea8073b36364d618e6fcbf1ef39b60f4
 EBUILD libmowgli-2.1.3.ebuild 801 BLAKE2B 295cf5e587db6db974e4e6e6d85ad2f049b1ec2b03477ed7f6c9f7dcf3b92023c54736c06a31a97fc94c88a175cd3b0011c4639dca4fba04a9865e496b219c48 SHA512 800bf7527324edf31827105316ce965abae9dcb9e283ab4c3810af13ba74e41fc9a5344646991fce235504588563c23282a15d6c079d0e246117dba9033e4759
-EBUILD libmowgli-9999.ebuild 714 BLAKE2B 02d0f1b1667400b1c3a1a6d7b408194514fbf5a89290cb9e7b59bf776973e826185b38a4fd1f1f411d36a76b60b98ed72ae4f3278ee79cacc6460a1022793798 SHA512 b5363b8374ffe5a0fd1332bc9b1a7a2aa576e99ae6e92653562f5fcf67df11e5dd5cdb28df539dd2d205389ffdf977dbf9d3f6f7b29776e8095cec8828c574b8
+EBUILD libmowgli-9999.ebuild 605 BLAKE2B 986896d6abd75d660d69f86a3822ef95d0626a1d4159970b2b58045b63b1c46866250b59b4467e1216d54cc74664e15790e671ab9a130d908bf0ce58d3d3528c SHA512 635c00a5c1ac8f50ab4f9dff6a1be4fc3e82ee73ca8eead7c553a4f961f65f332f04756328b878b678d4835c763974f8d2588a966679a6113d92fa95c80034bd
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
deleted file mode 100644
index 84028f134be9..000000000000
--- a/dev-libs/libmowgli/libmowgli-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="http://atheme.org/projects/libmowgli.html"
-SRC_URI="http://atheme.org/downloads/${P}.tar.gz"
-IUSE="libressl ssl"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
-DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
-
-src_configure() {
-	# disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-	use !ssl && myconf="--with-openssl=/dev/null"
-	econf ${myconf}
-}
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index 9a22f89057f1..5450f37c16c5 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit git-2
+inherit git-r3
 
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="http://atheme.org/projects/libmowgli.html"
@@ -18,10 +18,9 @@ RDEPEND="ssl? (
 	libressl? ( dev-libs/libressl:0= )
 )"
 DEPEND="${RDEPEND}"
-DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
+DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
 
 src_configure() {
-	    # disabling SSL is "broken" in 2.0.0 so we have to use this hack till 2.0.1
-		use !ssl && myconf="--with-openssl=/dev/null"
-		econf ${myconf}
+	econf \
+		$(use_with ssl openssl)
 }
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 638f090b78c5..01ad3f146b06 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,7 @@
-DIST pcre2-10.22.tar.bz2 1470620 SHA256 b2b44619f4ac6c50ad74c2865fd56807571392496fae1c9ad7a70993d018f416 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea WHIRLPOOL 154ee1c4d2445878c2d2fd1eafa96584d8c943e9e545937b37d4c1fb12ba847938647184723d429244bf5aa989ba335cfbf74fadb5d38227862762bd34166232
+DIST pcre2-10.22.tar.bz2 1470620 BLAKE2B d968869db31cb9b0d93586227e6b44ecab57dea625108a386bf6bf8cb007c17f83e0b427744eaa6b4d6a1f6a7f344ee0aed29726bb51d077ff51889e68faf072 SHA512 dcf70b5e5b73f29188a56e4d9efb9afdf2b9ebe50e13a7640b80f543851235a289e476e1f517f49fac9628b456268bcdaf2b492237bc879ddff36f84ef4f32ea
 DIST pcre2-10.23.tar.bz2 1515314 SHA256 dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e SHA512 3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456 WHIRLPOOL 8db3deb22c26688607e1dc4b52229c64f8bcbb80908155ff9bd58b690a239984b6f5d1aff0cdc70efa3abf3ee899e22ea6e3a502437af424cb92d345133889a6
-DIST pcre2-10.30.tar.bz2 1583543 SHA256 90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e WHIRLPOOL 4491d5ea682ee90dad91f5b1a3dccf482c17768ea5de3c5cca2fa2b56ba97180b746242e552fbe240b154f98eac5b11da466b86d34e9bfe7c7a202d4c976172f
+DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 EBUILD libpcre2-10.22.ebuild 2332 BLAKE2B 9836c5f234ce946d68c4e72cfdd2af039a9bf3664c8bab49a11a69dd3fdf337966cdeb2fb621f4493ddd0afa1ab42e56b21e3b0858ab84314a67069eb3448a1d SHA512 2dde1a17abd2795e57aa006a4b7f2a2e33c8d64d03ef1b9f106fad617f3b72ee0f897fe6e1263fa6244fb3e8c9a2ed18318fcd209232bed7825ef4cb71a46061
 EBUILD libpcre2-10.23.ebuild 2341 BLAKE2B 60d9fa579e14a2384c49d559ef6efe4ed1f62655c61fdc0b839f219bbe161bd8499251a67a84b1a726d0679fa29d828b3a667346a080b3b0a685194b376e78a6 SHA512 f6e07b46cebc6ea2a5414a1a023124a1078fe1a2f11b3e31b95758c7f77e95b6b455e86e89385811d6b5787584cbe3a0564d2aaf8e39f4112c9cb255641c79c1
-EBUILD libpcre2-10.30.ebuild 2352 BLAKE2B d01aab65319d1b63d9c59210666a8f53eeda1d6e86bc7d13a044a73b79b287d9afa49c9045e644a6ab998924b2f32bd18cd3774b24212c290c99ddfe93d72f91 SHA512 1c090e317e3714f0a7a2837a38ed3531a07201a3a6b0e2c2f380f03e5dc359e0442a73b094ae4933d55deddedf13606627f9105bdc97de1233275ad61c10faff
+EBUILD libpcre2-10.30.ebuild 2351 BLAKE2B e9c44ebe6e2d100a1cf700a143f0e6c455bcffe8b8688e8bc1defcaf0777f3ab89a2ef44431bcff773332a7ec8b5c62d6ec4f7a4511fdfde2527437f6cd1fbb6 SHA512 9d4067bf15e51df5df51f991e7812ee61a202321c1a69bc5fe2b22dbb56e57945bafd592f24e5c90d6a38366d440f207ba64e65ba8ec37190371fd432f9a8450
 MISC metadata.xml 1106 BLAKE2B 357dea3a03dcd1184cd5ac7c3fd79cb826d37410d27f06ad267e92c024bfc6fab891363894469e87bb8982d8c0a315320a20c22eb4877b3411b196a8b89c42e8 SHA512 8f2e0a7fd277da813c6aa00ff9ed9fe69443a6c738b2e66d09d5c5b4f6381110c1bab0a6b8be315f99f07254ae38c347aea4d50b54693bab3056c83830bec8cf
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
index 5e9a3da42808..0cb030245022 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b17edd452333..4b9b9106c904 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 9eb57296e067..3651fc773f9b 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,7 @@
-DIST cachetools-1.1.5.tar.gz 13378 SHA256 9810dd6afaec9e9eaae5ec33f2aa7117214a7a3f8427e70ab23939fe4d1bf279 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998 WHIRLPOOL 6118a940e3eea2b13a8c0544da87089cdb548b85de5c176f1449bb17e335b7fd975be66e6a33c2b5eb8cd04ad0f15f8e84810c3431dcfeab61627d28158780a7
-DIST cachetools-2.0.0.tar.gz 18592 SHA256 715a7202240dc20dbe83abdb2d804d543e2d4f07af146f53c82166bd75f3a628 SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d WHIRLPOOL 1ea550d341b6586381b83b672eac41411b041a04ee579d5424215d69d0a3ac603f79b98165d97100abf64ee1e15aab100cbb0c50082a0ad65446e5b552d34e23
-DIST cachetools-2.0.1.tar.gz 18790 SHA256 ede01f2d3cbd6ddc9e35e16c2b0ce011d8bb70ce0dbaf282f5b4df24b213bc5d SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade WHIRLPOOL 372a28e0f01087bae226ffdde9e7f9d4858f94046d390859faca702ddc19f62da17fb2faff16b9651f7646c498cb865d2eda846a32f0c1b2be7520b67202a264
-EBUILD cachetools-1.1.5.ebuild 443 BLAKE2B 9980d78eb05311d7f501d69848adcb541326c0f082403ed6f48640bc233316312daf3896d900cc55c7dd2fb1ad827b805222bf06d2f3f6810f4aa01a9e57338d SHA512 902e1c8c6149da1318d4a585052e009bd7fea4a90d2544a343b7640348ac2bb535685c74e3779a79e0a35d860ea0c1167c6e6a493c2aec88dc1208ef2def35aa
-EBUILD cachetools-2.0.0.ebuild 571 BLAKE2B c94f2b44d39ad7213c5c32b377b91d98db9f7888bf57c415b930cb136e503f085e1754d663fb589db9e9f044ffa370063abdb2758501befa8602a8751e688304 SHA512 2b9ba5970d3730b88baea3a981493cee8504f9444b23aca0a3563e6ca9318fe7ddf38dfb9e962fd5f997cc01107b2a878fa2e92a8ce2c94b5f1ccf5e33fc16fd
-EBUILD cachetools-2.0.1.ebuild 571 BLAKE2B c94f2b44d39ad7213c5c32b377b91d98db9f7888bf57c415b930cb136e503f085e1754d663fb589db9e9f044ffa370063abdb2758501befa8602a8751e688304 SHA512 2b9ba5970d3730b88baea3a981493cee8504f9444b23aca0a3563e6ca9318fe7ddf38dfb9e962fd5f997cc01107b2a878fa2e92a8ce2c94b5f1ccf5e33fc16fd
+DIST cachetools-1.1.5.tar.gz 13378 BLAKE2B 68fadc9a3807e28a623671417bad192222120d408e204159956c31d2c285e7debea166c1298e9d6cc6f3ecc7c6a05bcf4a5270f303872925e0f5603a2da51bc3 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998
+DIST cachetools-2.0.0.tar.gz 18592 BLAKE2B edf075b10dfcd9da9416141e8341b06ab93c88d9af59df3b960dd666e305aa94cebc46bc4290f324369a8ffd81853136b9d8318f20257d234f7e0fef7784e41a SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d
+DIST cachetools-2.0.1.tar.gz 18790 BLAKE2B 48ce160117086306f5dd7fa7d74b12cd05db76089a1b98e78fa77b81e0f99516523fcef1d43c434137689b45e988ba7471469009049337f8e4a9a8aa6bb2e2b8 SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade
+EBUILD cachetools-1.1.5.ebuild 462 BLAKE2B b371d7e660ce6a403996fc301d4d869c4e540ca981ebe7dfed5ea18808466b3caab3d6780f864db2d06ef39aa64728cd06c290445235832c2edad2ebe6bc3d14 SHA512 a144968aebfc5b96948ec3c359ec7129a0e0ab079ef01a46127e21e0ce5f3c3d42842caead2eac67782b96dfc22384cc4643c68ff458b423a580c99ca34e2ce1
+EBUILD cachetools-2.0.0.ebuild 612 BLAKE2B 6dd535590a0abdf9c8fe59d2a3a632b8cabc35c2bc4c6c62b442e80caf798911287459a4882d2c01d1e764a5be495859e5b22c533111baaf25c11bf8c7950358 SHA512 b422c410857756b67f79273d68da9fb4e25632d9a445a85edfb35d8e74d1899ec4365b431185bf963da5bf7fa786f6428f5e04eea445b2209ddaa8124540fc1d
+EBUILD cachetools-2.0.1.ebuild 612 BLAKE2B 6dd535590a0abdf9c8fe59d2a3a632b8cabc35c2bc4c6c62b442e80caf798911287459a4882d2c01d1e764a5be495859e5b22c533111baaf25c11bf8c7950358 SHA512 b422c410857756b67f79273d68da9fb4e25632d9a445a85edfb35d8e74d1899ec4365b431185bf963da5bf7fa786f6428f5e04eea445b2209ddaa8124540fc1d
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-1.1.5.ebuild b/dev-python/cachetools/cachetools-1.1.5.ebuild
index 29819db959e8..3f953c75b8bd 100644
--- a/dev-python/cachetools/cachetools-1.1.5.ebuild
+++ b/dev-python/cachetools/cachetools-1.1.5.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
@@ -16,5 +16,4 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cachetools/cachetools-2.0.0.ebuild b/dev-python/cachetools/cachetools-2.0.0.ebuild
index cd68328fa25f..ae128ff5b3f0 100644
--- a/dev-python/cachetools/cachetools-2.0.0.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.0.ebuild
@@ -18,6 +18,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
diff --git a/dev-python/cachetools/cachetools-2.0.1.ebuild b/dev-python/cachetools/cachetools-2.0.1.ebuild
index cd68328fa25f..ae128ff5b3f0 100644
--- a/dev-python/cachetools/cachetools-2.0.1.ebuild
+++ b/dev-python/cachetools/cachetools-2.0.1.ebuild
@@ -18,6 +18,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 918155b8e81c..a069145d6b0c 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
-DIST contextlib2-0.5.4.tar.gz 28523 SHA256 710626cde569f51a87f216ff757fe60f5cd13ae8f8114706590510cd5649ce88 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66 WHIRLPOOL bae1717340b05362ae2e55b995920d39e01a37fb147e19838e6a79176809daa39e3fe5774ce74811614fcdadf8f1b28ea757cdda5e4811543dbc2d4b230b132a
-DIST contextlib2-0.5.5.tar.gz 28755 SHA256 509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d WHIRLPOOL e8b79b9df04541756de5575ff69aa048e285fd4bed2345346932ee0938f85bd73f791d4ac86e836237a2dc865166f8d1ef703c120d9580a616bc2f53b9f0eacc
-EBUILD contextlib2-0.5.4.ebuild 571 BLAKE2B ed04be668e0e957311cb80621f80268d38a7f3e630610e55b0e24b85afb0b1e71e3e5f4459ebd44cd9ed79888451bc5867894515ff48966c88af85e74ae2eb9d SHA512 64806c9de5ec417a1e71a0eec86ef9a39031d9e8b51429d27ec210176e2156b7c2f42cf32c05fb488a7a217164011e283c108626ac5aedb913f5daa5faa8b247
-EBUILD contextlib2-0.5.5.ebuild 595 BLAKE2B 20bc2cbf2d9dcbc17e20fbf6b6e080f4b118eeca7812ae66cf48d78aba7cc327e23fc096bf7c22dd36d49a74a839acb17092d98e5718c100786f1d7f5aae09ca SHA512 814caad8b882ee491ac6ca5f99b5c37dbdd495e924c568a28e8bf1b94f40e44568b9eca04f2c6efc6b621297328ada39f0098ad7dd425afef0f98da17729fdb3
+DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
+DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
+EBUILD contextlib2-0.5.4.ebuild 615 BLAKE2B f3020ab69487a87067ce7148f7833665ff3d81bf04f07b1dead69e2e12d307dee6319bfffdf80ac18427a5e98a8cd7759bdfb6a7a14082380e8260a137cca116 SHA512 79df172750eb66c1137916eaf2a09d5cbb9b2601f0608c1c57c463d14544d5847da6fa5b4af22cdea763cb4b00aa2c95a58dd1420da53f4f6d302f97939ed20c
+EBUILD contextlib2-0.5.5.ebuild 639 BLAKE2B b88f667c9ecdc65e8b29b35b2c54d56bd8055abdee9aaf9cbf5799ffe72e0fea4511a47d8eca5957fe582e244b4346cf55d873c601d2839fdd438d42f8d25cbc SHA512 7ef0d9e8fd69fadadcd544d1059372c7ecb7c71f45e96e97f52a91ee92e5f60ba902f8ac37c9df36064336a28a14948a58c31e23197d1e4d79274a8dca5b1af6
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.4.ebuild b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
index 6884affba34d..0b8197e7e1dc 100644
--- a/dev-python/contextlib2/contextlib2-0.5.4.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.4.ebuild
@@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
-DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
+"
 
 python_test() {
 	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index cb4c36f11536..ae2aa414dae0 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
-DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
+"
 
 python_test() {
 	"${PYTHON}" test_contextlib2.py || die "Tests fail for ${EPYTHON}"
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index e5a8712eea4e..9a8333d2cbb3 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,11 +1,11 @@
-DIST jupyter_core-4.0.6.tar.gz 55060 SHA256 96a68a3b1d018ff7776270b26b7cb0cfd7a18a53ef2061421daff435707d198c SHA512 e6d7a0293ce6cdd3202b354aae62900683eb0474590980bf3d9c6f89b4b16182e7caee0e42c3feb3de5851535a01394b20725d9428eb105dbc2c34d90e0d398b WHIRLPOOL c1370d386c63665db1a47f1df0e3942c713b4f9e71ad5a2bd8c83bcf1b5dfe937fdadcd606335a989514499b9e6446d92a0bb250b9e972181b12d0d9423ee80a
+DIST jupyter_core-4.0.6.tar.gz 55060 BLAKE2B 815a22b35a2fa46d37b9a1b8ec353ca049992258d040090ac548175de3c759aae443ca977eac9ffce5d7e5f6369eab60037f376324dbd2b98b116632a9a31fc8 SHA512 e6d7a0293ce6cdd3202b354aae62900683eb0474590980bf3d9c6f89b4b16182e7caee0e42c3feb3de5851535a01394b20725d9428eb105dbc2c34d90e0d398b
 DIST jupyter_core-4.1.0.tar.gz 56500 SHA256 146af0679c33c56db4b85b785f3dacd933ffaca97e7d2d56ff577a5485c2bd13 SHA512 863c4611093e914d92ac268d26e546842132d398d30f78c8440830a426da2923912b7da484ca3282a3f737300af316a305b8417cd1c35acd4a0ff93de1309d39 WHIRLPOOL 80427965a8394f1e86e0fc9a456eb3396cf37ed6e3c4362acb5998121d7b02c3242c3405871a2c25b71394716af039211a994fdbac5e833cc55c7beeb6e29d4e
 DIST jupyter_core-4.2.1.tar.gz 61794 SHA256 89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3 SHA512 775a1ddbf6f6cbd44bf924017832c4fa394c453c778639d4d58ca9a11d79574c5203858bd05683210c887ba469baae1290d1885a59833b129064a9c59345ad19 WHIRLPOOL b1797cd8884bf56f7c6d85123251572d18ee0a46bc5b3c8b6bbb97bcfa82b9f70b8b74aaba837293a11c714a5c0ecf99f0740c0d0e3d2250d4cd019533c21f00
-DIST jupyter_core-4.3.0.tar.gz 57998 SHA256 a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40 SHA512 8e84cae53e035e3a3d29fe3b64246ce75bed291165db4ae7fcad472e1f1523d740ac168cb97330844548f3df3d7d82cd833886c1b755761b93e01153500961b1 WHIRLPOOL 6a1237ad91a06d6a5ff8b50258344983d6933cf7b798345471b350ee3a6c87deecca2411d0a009e4d48795b9ba307cc78908d4248439a6ef6f37a07a54b923c3
-DIST jupyter_core-4.4.0.tar.gz 63613 SHA256 ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7 SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e WHIRLPOOL 9dead3ca5eff2bde1228cd4b52bb8d529304c3d70071a2dc2f1139c00273e1ee3b787b4366182ee5dc721beb58f1403758fc72a4dc0ac3bc7b9e6c5fb9f4a62b
+DIST jupyter_core-4.3.0.tar.gz 57998 BLAKE2B 1a98266e9d069ca3dd01fe76e08084443b22e77870edc78f16ca0f6b96e39b3d6dfc01d3b72d292e8171e900672e5e7fe358ffa26a984a33d72b7ec97aa550b4 SHA512 8e84cae53e035e3a3d29fe3b64246ce75bed291165db4ae7fcad472e1f1523d740ac168cb97330844548f3df3d7d82cd833886c1b755761b93e01153500961b1
+DIST jupyter_core-4.4.0.tar.gz 63613 BLAKE2B 90b5d6c855786beff0ab780e7a894e1b24f6d6d1c26be6ae8da73e82a87f966f1155498c581314d37db845e293be7bc4d085e03991cdc7adfbba36409541cd5b SHA512 387f7f98f640b85ff0a24f11e1beae5a851d7eb3ba4a423be028940cb018c0d0ddf42ae8a1c397e3e4cafa560d3a5385b39bb8794448c7c010be7f0ddcba8a9e
 EBUILD jupyter_core-4.0.6.ebuild 1145 BLAKE2B 70f2fa14bac4a7a60e2834212128f529a887fe003bdddd2994e08c53aa71d622a58a5a2e674941aba4b8c4816fbcc031e44f84ebd3cbb876b9e734101c59d35d SHA512 7a37085e333e3efde2e1f06083b348b51e571e0bf48c47a3bd40c25a830ed7695203724b26a14c3e4b147fc31f4a43246e5aeab438ac3b1156b5824066436431
 EBUILD jupyter_core-4.1.0.ebuild 1145 BLAKE2B ce196069db087f468023e2e12b4e923c02a96f7768a195d63d12b1bb6b159d2c2e57639c8833596d0aa0f8334c449af06d2eda54eaaa05335a9a52b68d7379cc SHA512 5f5127ca454f3c60a9ce41751491031335f933fc6c965e1e525854c7870f3d4afbb079e7bf97dd9821fba28af4c64f830e643d655c40c24639b6d747dcb36224
 EBUILD jupyter_core-4.2.1.ebuild 1177 BLAKE2B ffacffd2891916c5f701b022c3fadc51e09eddf16c495212ee0624ff2a3b2b0ab1e094bbebc74c9c260072c33691e42943f5da524bc06eb96a124ac6bd383a6b SHA512 5364e8ee4d268f0afe1f55ec54e064f64081e2644d4a9f61ea1fbecd99206a18ff0b4fd017e7552a1304352ad0187b5e9462227e7c21f102d3342fc5cd2bcfdd
 EBUILD jupyter_core-4.3.0.ebuild 1123 BLAKE2B ace3719a5e3a1dd8f41202ee71af0403f4a6c01dddc8ca59452e57d7d467f0689162610e2adc03b931caa4b0dfcf9082a9ddc36c5bc98977169df20021670e57 SHA512 73b3a1bcb6c69e820a31917672c88ab6a7aa2cac4dd24c60e69e889c9eb40270afeabe99d85b30cdc90c1391814e66fa81b55917e26f85030358622dbd6eb061
-EBUILD jupyter_core-4.4.0.ebuild 1123 BLAKE2B ace3719a5e3a1dd8f41202ee71af0403f4a6c01dddc8ca59452e57d7d467f0689162610e2adc03b931caa4b0dfcf9082a9ddc36c5bc98977169df20021670e57 SHA512 73b3a1bcb6c69e820a31917672c88ab6a7aa2cac4dd24c60e69e889c9eb40270afeabe99d85b30cdc90c1391814e66fa81b55917e26f85030358622dbd6eb061
+EBUILD jupyter_core-4.4.0.ebuild 1179 BLAKE2B 0da55ee11880ad68ae4462495d63606c626e816c091d3c997c8f3a29a82f1c2352d86d997d0e75245ca01f6e8e9c5d7887f3a56812d9566f7729dc09f0ca2106 SHA512 e341db2c97ba17e7ab31d58939a429efabf3db8e758feced836c7357b9554ea388d99955617f8da8af714c5580450fac5cd8d90df56821abee867e27d054f3b6
 MISC metadata.xml 626 BLAKE2B d12f30014d60ed759b3d618b4fdb38bdf6d2d28738bc8c910d427d72e43cf792164cfa4811dd8c5717ecfc9d4705f6b4fce682be6d841b7185adc2942a62942f SHA512 bdac450a0bc297c925ea6431253eede78d61623feb30e1901f51a9e31722642741d5bc009162e09eb5b0fd9ca094e2eff54846b2612e99116239d764abb05533
diff --git a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
index a64ed0b484f5..e42ccb8df682 100644
--- a/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.4.0.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}
 	!!<dev-python/jupyter-1.0.0-r1
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-github-alt[${PYTHON_USEDEP}] )
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 7d076021af5c..71f8fa7ac338 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,11 +1,11 @@
-DIST setuptools-30.4.0.tar.gz 655934 SHA256 2bea341aa5b48ae05521374d9c473713e42dde7f8712a731904a6f8257e896ed SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515 WHIRLPOOL 4866efbe00d23291ad07b401d7924f2f150a38664ab0a3d9afe9e00aa4e887de6c9e82f81e7d2ec157b1bf05406b2616a08772fa9f3a45e1e20fddbe27c11fd2
-DIST setuptools-34.0.2.zip 617839 SHA256 a5bdc45a3c123a88c84e089a789ba70bbc61ee888c1306fd9dac04e037e81c37 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266 WHIRLPOOL c9350f96628957c0bab680a2cd018d27d93f04afded737b317b9ea527e0bad3ea9c4f4af2a31843a3010573cdb0ec1c7fbdeef371cfc8cb5c8de93b6d762bf1d
-DIST setuptools-35.0.1.zip 624263 SHA256 eea7f2ff55d4a810b6bc39be1ad1c60c2702341b78b2365c71306eaa7316beac SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d WHIRLPOOL e33041a6f03dc4ceb4a34db4c18a4d76a908b4e5a726ad18598cc202aca24df0a81241aa72812b7a31b1e452dd265e813c58ea23255e37a75c2c2ec2f73d8787
-DIST setuptools-35.0.2.zip 624829 SHA256 1e55496ca8058db68ae12ac29a985d1ee2c2483a5901f7692fb68fa2f9a250fd SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116 WHIRLPOOL 23b22065ced0a7df25ff35b79675b94e6146ec9ca7eff7c27a94d5aea64e4e9356e136fb537f642810a824eb3e0921d817b5739fe9cd3daf083cad99475354e9
-DIST setuptools-36.0.1.zip 711296 SHA256 e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8 WHIRLPOOL 9818d419a11ab6493027fcf27a48b087c80a10fe2bf3b0539893bd57b33be23ed5b90572682f0a27850044482f03d299905e04cc890f724d3cf719d34bf36464
-DIST setuptools-36.5.0.zip 721505 SHA256 ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43 WHIRLPOOL a18b45eb750bc92579d0179d0d5797d4cf949c20ab4e6cbf0b4ae154d351285983505829a1f0f0ee71b5b4aa3793bd3306ab3a9c44ea42b8306cb80cf3d273ec
-DIST setuptools-36.6.0.zip 725173 SHA256 62074589522a798da243f47348f38020d55b6c945652e2f2c09d3a96299812b7 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319 WHIRLPOOL 62e0e32eddd56b758dcd4da415a422e78f51acc58f83dc887d6ca67d7836cfe28dc1bdf4acb423b5e1f694c79ab4a392dbdc5f8ccb669e641f70f8c6f37f62b7
-DIST setuptools-36.7.2.zip 726758 SHA256 ad86fd8dd09c285c33b4c5b82bbc21d21883637faef78b0ab58fa9984847220d SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9 WHIRLPOOL 4000d4657f39ccc63dbaa98a3ee695d63dabfca361b574bf552393e633be4ce31b67489a3eea5b780b55e7385da220d2b3339fbacacc776eba379a13732724aa
+DIST setuptools-30.4.0.tar.gz 655934 BLAKE2B 312a70dac5a75fd9f4f9720d20a3b224b6d817986779d3c250d208038619ac53d7f6139d2bfd21ce66b1374e746115e2933a1a2832cc6fec5b9c69f1ad26b45d SHA512 8239262e11c7702165d7539d57982dadd16e61a992529cb4d5f42141d57ffbab46fd928c765d0439ec4f07db1bc252b9a4604901d8f9951e55076438bdd6f515
+DIST setuptools-34.0.2.zip 617839 BLAKE2B c06ef384a42430ec8f4d956723d21f70fdcf993e41fb6d6e8b4fd18a7f12eeb957f9aef3e8b81e59f006452bd7dc8f59d6c5dec07ca099156f93fa74b5f4d152 SHA512 8ff6475620fc18e5992900dffd50158bfea980d3e7f2c7c98e8c99180b2f11b3f81c13a60f93516da580def2543a786940cc164dcdc36802d9657c48e45d9266
+DIST setuptools-35.0.1.zip 624263 BLAKE2B 83821fa85b19eb7f84eea1226d3fb750c5199a08aee84fe27dae3df8ea2afa5aeacfa7191ed51e10e216d49bf3bb90251b92ad3e8eb69c98bb4b05fd5eeb4d30 SHA512 a3f5362ad64dead468172f9989bc62043ce736180d22e50d9815af25aecbceb58e701bb87a643b9fbbf0beedb37a45268b23b1b5e7e6e397aa124f43b1d4bb0d
+DIST setuptools-35.0.2.zip 624829 BLAKE2B 3c4cb71ae07bc1a2ce63a9fd562a3c2270ffccab60c79ec88ee6e3f2d80249f2efaf0a65cd1842bce8c694cab77a39ed6a00a56df7bedd907a9d477d7eb6d10c SHA512 f80789cef8fe86ff1989e7f769637d1f6cb2008c6190609b8f8c5b4fdb63fac83267709895c7f502a09a693779b41e6ee0551e94f3348b64b6108dbc9629a116
+DIST setuptools-36.0.1.zip 711296 BLAKE2B c58a4efd8d3a2d574ff6ba5cd01a196fc7ad61a238119ac95714239965875d91e4613d08439c63ab3b9a0794b04ead5c6e8de09839e0306e4d29f47c2c7a7c58 SHA512 cbcd2591d0d8a7591c5d9a1d4173814afa0b984af29f2e34d26a37c357474b043f371978ac224cea12f50834d91babd9f14b137488c4edcd62594e91aff903d8
+DIST setuptools-36.5.0.zip 721505 BLAKE2B 4b5ca4359d1576952e68589c39b4fb0365d710df799a44869eb91da6037a2fc0b38afff7313e97c249adadc397f9fdae2f7ea208e06f53e352f32f8eed779a64 SHA512 e61c2f9ee640bf5dd8ab7c7a7c29667d91aa2498a7b027e387493ad7bcc9b56927e6fa63cdb4e083333c57eb355a670ba3df861ed5f8447b216fef0bc77c8b43
+DIST setuptools-36.6.0.zip 725173 BLAKE2B 1be948d561025b1ae1e9442fe2dc55b48e0ee3670ad47efb9296a25878df69ccbfc99d75dd6c906e5c94fc5f262bb19d01849b1fbf7f436f95830416470681a5 SHA512 b1b7fbff45db72e24ffb0aef41509a8f49c3911f20e6dfa7335aace22d0b2c533615edd1626c6b58602960644d1a3ad7b2e6899efeec4138aa58a187d063c319
+DIST setuptools-36.7.2.zip 726758 BLAKE2B 8821d3142f2149fbdea4d231052c3990fa7a14c57c421309683c6a65102ce4911850acd5d492087aa0f14a0026da732e47eb9bf971030443fc1b57f9f909aaaa SHA512 746dce135dbacb65565787a20a2611388605e2371c94f0f8803e7712e515e69c270751d16a21f381bf6e8ddc0a1b39494db7d0c67bb32e6230a90c5d517e78f9
 EBUILD setuptools-30.4.0.ebuild 2058 BLAKE2B 81629a9e47a1da4556c7b48e13a0e7853ecedf50e43608b5f3d708050ef41884e46e5dc7f72b929b52240edb1391016609296fc478b45cb97e0b2c134523c40b SHA512 c14b6452d4e7084e3b645981b7b615d223b97e3fd50d75341e27274154d0f2e9362ca6605cc20a4a83dceac26dc65d018400606a43455aa292778911ac9f6cbc
 EBUILD setuptools-34.0.2-r1.ebuild 2041 BLAKE2B 636bb3604f802e4854dd4835da7eac8cfe2f0eacbaef2b8bce8906009bf424e8152e076f505363adca79aaa9c47fe12cfc1bd4c7a35c6e71077a43064f18c551 SHA512 8a9db9943611582d5276ed7f009cba5ae5c839b49d21e95ece52d94da6508a70811117e3aa1774f195f976428667d5b3872cc2192f78294456eb83fc50addba2
 EBUILD setuptools-35.0.1.ebuild 2035 BLAKE2B 33e913654fc4d814a01c118c115163db85691a83123d6e3b494d537a2aa9f9a8f7648f8b0037249d98dea7bbc600c14dc6855b86ecad1a9476cec9b15b2bacc6 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4
@@ -13,6 +13,6 @@ EBUILD setuptools-35.0.2.ebuild 2035 BLAKE2B 33e913654fc4d814a01c118c115163db856
 EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
 EBUILD setuptools-36.5.0.ebuild 1791 BLAKE2B 1af27895f3764195595f2674ec4cdcbb697dabbef7be50d4c64ce86a58eb3d714c023ff3301aa2c4c45098d1ae3ff89fbe05e5cfea68ef3ef54a6249bac67d0e SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03
 EBUILD setuptools-36.6.0.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
-EBUILD setuptools-36.7.2.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
+EBUILD setuptools-36.7.2.ebuild 1830 BLAKE2B b10c4f7154c2689a3d88f665efb72bd7e6aa398c82369bcccc00fa70996aee9980bfab580c99258896357e65a5c67514ed4c2a72892bb131e78ce067a482a78c SHA512 e9a7271c020e25d310865256e9f6bf632a13bfc8d84fd4869cc4b5d289f93426e182163842a6db7bffbb5fe83038c5634d784cfa44dbee8e957155c913d73c0b
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index b9335a39d953..4665a12e802c 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 6e014cd08750..d0e99e2714bb 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 49ea8bf8ad11..b4a6e3c950b9 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,8 +1,4 @@
-DIST genpy-0.6.5.tar.gz 51689 SHA256 35e5cd2032f52a1f77190df5c31c02134dc460bfeda3f28b5a860a95309342b9 SHA512 aeb4edf97ccc6b480649ee67b7b5782e4f950e02cc898b52285db1a23fe5200a853817ae734dd32ba964073359b60bc9399abe0e4a9bc7d0e46c5f6f78e1c10e WHIRLPOOL 4d9c9d1d2f3e63f73c02b3ea1f6c53450429e45a972a9cf27b6ec77368bf2cef4a4890e0cd6486ef810c1eb5bdd6d2ea5e09974f71f738d98df609f60aa0f248
-DIST genpy-0.6.6.tar.gz 51949 SHA256 8a1a90f1e64bd9458c24ca18af88d3c95032b4c04e3b8164fce6b365ac11301e SHA512 f85e916f4b20e3c6c8a7ad81afcefc0912ed82f6d3a59afbf421e97f8a5d938de85a6d035b75725829efe03ece8a6f649aa179f858e0eae8e429ae9c62fd6edd WHIRLPOOL 16e247c1a21b5d2d3399a786999d5d39fc5370a2bb18b6993b02d4e870f843cd9fc6a866a04b945e708de90f3e658c57d8f9f2873051100520647d326766d73d
-DIST genpy-0.6.7.tar.gz 52001 SHA256 d1b6e9031c255bad2b29c5cf76736807c3245e14f017903a9be8bf68a74ede2e SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8 WHIRLPOOL e1abc845072ec1d137070fe58e14d4bdbf34dee9e76342ce829cd13281f3de11c49aaee717061bc15b59999b8f3d4d51b96db3150bbab7026bf0f851cd2911a7
-EBUILD genpy-0.6.5.ebuild 536 BLAKE2B 426d61c937793e15f3ca78d53baed0b319a7f72babb22522e327e07add615815fb89763b29257d25182abf5cc31dc8efaa1fcd48d6cc4c523ca6f4638507ef7f SHA512 d69ddb4cb1cd82c5c9d1d0b53211824f943553e30096a9257016e42582b86c147fb79efb8cdf7271e5301f282d520359a18d8d0006592e9ac0b3233450c503b3
-EBUILD genpy-0.6.6.ebuild 536 BLAKE2B 426d61c937793e15f3ca78d53baed0b319a7f72babb22522e327e07add615815fb89763b29257d25182abf5cc31dc8efaa1fcd48d6cc4c523ca6f4638507ef7f SHA512 d69ddb4cb1cd82c5c9d1d0b53211824f943553e30096a9257016e42582b86c147fb79efb8cdf7271e5301f282d520359a18d8d0006592e9ac0b3233450c503b3
-EBUILD genpy-0.6.7.ebuild 536 BLAKE2B 426d61c937793e15f3ca78d53baed0b319a7f72babb22522e327e07add615815fb89763b29257d25182abf5cc31dc8efaa1fcd48d6cc4c523ca6f4638507ef7f SHA512 d69ddb4cb1cd82c5c9d1d0b53211824f943553e30096a9257016e42582b86c147fb79efb8cdf7271e5301f282d520359a18d8d0006592e9ac0b3233450c503b3
-EBUILD genpy-9999.ebuild 536 BLAKE2B 426d61c937793e15f3ca78d53baed0b319a7f72babb22522e327e07add615815fb89763b29257d25182abf5cc31dc8efaa1fcd48d6cc4c523ca6f4638507ef7f SHA512 d69ddb4cb1cd82c5c9d1d0b53211824f943553e30096a9257016e42582b86c147fb79efb8cdf7271e5301f282d520359a18d8d0006592e9ac0b3233450c503b3
+DIST genpy-0.6.7.tar.gz 52001 BLAKE2B 6c2a6cbbac6b0c72b1d5bec160f2f06ac86852afa2664835a4223e5adc5df6ae13a3a506d1c684f39f1066094f437fc54e4deb927c9e58209231af599b70af77 SHA512 645db3b343d53a640c6cbae91ec178bb99249899632b88f54831a524c2c3d76a68c8e45e2820b536509eb3d84a37735f9a3cd04f46522a98748a38534cc9d6b8
+EBUILD genpy-0.6.7.ebuild 536 BLAKE2B 8462535e0e32758182017802c3debefe52367cbf352cab954593ed0beba89cc81bd1ea1a04f7b4558b1c2c795ef82e8cb9a0715ac3703464aa702d0593311533 SHA512 b5bc640f188897864093d18d82b38203f94dcdaca31b73c12cbbe2dfba3649c7b58bf0c7e91ee16d1ff9fb3295b2481d26f90f74dde737a58fc84cb65ca2940e
+EBUILD genpy-9999.ebuild 536 BLAKE2B 8462535e0e32758182017802c3debefe52367cbf352cab954593ed0beba89cc81bd1ea1a04f7b4558b1c2c795ef82e8cb9a0715ac3703464aa702d0593311533 SHA512 b5bc640f188897864093d18d82b38203f94dcdaca31b73c12cbbe2dfba3649c7b58bf0c7e91ee16d1ff9fb3295b2481d26f90f74dde737a58fc84cb65ca2940e
 MISC metadata.xml 323 BLAKE2B 025145a67d18622d14ea6ac43585246aac2cdc4f65e63b04dbfd32aa6f04f4e301e22f2e326a486e2fad3c1ef82f9890179a8dc142f4aa551b5b9db155e616da SHA512 523ec83e710fb0b80d731b536c8605a4211bfa176951a1af5ee6f6e60fee1ca3634c0d659b2d3ae71f3bb9d3765cc44cfdada5c7a364cea63f323c462227f364
diff --git a/dev-ros/genpy/genpy-0.6.5.ebuild b/dev-ros/genpy/genpy-0.6.5.ebuild
deleted file mode 100644
index 3176ad0840ad..000000000000
--- a/dev-ros/genpy/genpy-0.6.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/genpy/genpy-0.6.6.ebuild b/dev-ros/genpy/genpy-0.6.6.ebuild
deleted file mode 100644
index 3176ad0840ad..000000000000
--- a/dev-ros/genpy/genpy-0.6.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/genpy/genpy-0.6.7.ebuild b/dev-ros/genpy/genpy-0.6.7.ebuild
index 3176ad0840ad..04ed50e67a15 100644
--- a/dev-ros/genpy/genpy-0.6.7.ebuild
+++ b/dev-ros/genpy/genpy-0.6.7.ebuild
@@ -15,10 +15,10 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
index 3176ad0840ad..04ed50e67a15 100644
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ b/dev-ros/genpy/genpy-9999.ebuild
@@ -15,10 +15,10 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ee7cbb7a5e77..1b5530bbb953 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/gettext-setup/Manifest b/dev-ruby/gettext-setup/Manifest
index 45642d54b762..67553d8f1aaa 100644
--- a/dev-ruby/gettext-setup/Manifest
+++ b/dev-ruby/gettext-setup/Manifest
@@ -1,7 +1,7 @@
-DIST gettext-setup-0.10.tar.gz 7910 SHA256 a779a041675e7f473f14c60dd465678e8387afbe9ddb7378e4bfb23bae35632a SHA512 206b8494b144d9dd2e226ee053c7ddaf40c332d2675720bb9347269a0d6fcff097d7073c2053d91f220135bfae499108cca012a277bd39a003b9bd2e2d43854c WHIRLPOOL 9726cb748485b2030097cae3b854d96f6940737672abdc5c62bbcf58538846b76d9f3731dfcb03091c63fd73329302b143216c36a2000c565b8cfa2861ab70fb
-DIST gettext-setup-0.26.tar.gz 14158 SHA256 0aa61c1fe41dfc45e465b8916e6ad95a880d0d956cf9ec3e19e279f9870b9286 SHA512 c421a06b11a09ab68a1c784b355bdf0a1aeb468f0af8b2dc8e14dabad091a3f5ffb56eee2f39885dcd271cbe504c4c97a220c560da6b7dd5552b537be6455c2e WHIRLPOOL 274ee61cce3de6ff385cdcbef6d09812cd5a661e70483a605ccc9aa2b87aafacefe8b233880c8aa385260cfc43819604fbff969cee4bdcdbca99e32c3ab702a8
-DIST gettext-setup-0.28.tar.gz 15594 SHA256 ef2fa58570fd2fd685f3ae7e4cb84b07c0333dfe23b3d148c094835393362738 SHA512 92526b21968a3357c5b86a953b83b28ce640be1eb3245122e89d701c3c3b9d72fb58c0c1f43a81f0fd0dd317dad69eb9f06abca818a394b9f14240d729949ab8 WHIRLPOOL 602d47bd3f07c5f75d0345e9231711aa1e28ca27506423cc94665bef4a4b4c645bc324c910815396513800d9d2f5f2a1de548b7ca855d3b452da6512d2091191
-EBUILD gettext-setup-0.10.ebuild 833 BLAKE2B ad975dca67340f2dbc117ce05215c748155af2b888fefc54869c9b19f9ef57ba2793fe353d28bcb747af600809d179d89c607400a076d4c7513430d3b7ac6a38 SHA512 e7d59784029263a7a50aa91c88e9ae1c8a938188679d2e010c44c40766f20aece5913fea81ebf5e2ced4a4a16d91d3843363d2f36a55d64312ae36bd1368b629
+DIST gettext-setup-0.26.tar.gz 14158 BLAKE2B d5efd85e736f2bac5b9a5ae4947a5353f83378444e64d2d999d95c765352c16147254d069faac87b6d8d65d44e52af850dddc0e11e1cb6ea77627f2768bf19b7 SHA512 c421a06b11a09ab68a1c784b355bdf0a1aeb468f0af8b2dc8e14dabad091a3f5ffb56eee2f39885dcd271cbe504c4c97a220c560da6b7dd5552b537be6455c2e
+DIST gettext-setup-0.28.tar.gz 15594 BLAKE2B 5cda2bd48cba44f38a27020febcbe6e9ee653d5399d17e942272fb4e3b7e5e54ee9612c2c3367dc6a41544363947cff8051af6fcb0f037dfa0a9bbd13274b20c SHA512 92526b21968a3357c5b86a953b83b28ce640be1eb3245122e89d701c3c3b9d72fb58c0c1f43a81f0fd0dd317dad69eb9f06abca818a394b9f14240d729949ab8
+DIST gettext-setup-0.29.tar.gz 15811 BLAKE2B fab356f79e9a84433df583d122a391240ec9c412b062d6aecd13116bba483b3e9f71f8364e82cabc1f695ada416c99fcc8fafb2c8a7b99dc9f21881b4c045069 SHA512 b6bad9c38481880f1086ad9edca86ee46d5afb915213591d7b30526ee3428c91325f59f977ab21395fdc73df702f05666a3e00116ac5765b9bf66ce6bfa90575
 EBUILD gettext-setup-0.26-r1.ebuild 1037 BLAKE2B 54c2d5aea4dafba440dbdf0b6e72cf76b2ed972412047ae3ff053ec16f22acffdad954b9094e1d07ed5de08e21e480053f35f446c431d6d569c247274775133d SHA512 5d9eaccd4a488bb4fbb07247fc0f359919e7c289d21f9de9147dacefd6804074f2ecb7fe4685166caa101fe9b5b65573f91086ff1e575e3cf0fbd2fbce93ddd7
 EBUILD gettext-setup-0.28.ebuild 1044 BLAKE2B 0699a94e54ffc5e3098f5252a65a846c91e8db6b14115c6436b5fb61c884dda2e361ecfd2ac26976687279bf3b7749287d2e81b1d6407b0296d13bf1865fc9a5 SHA512 5e18394ada417abe990503c7320fe01fa5e749bb1cd26c7d6f6c45b4f454054b7ec128e5a1447d44c506ec988fe5a87c4400c5f91108f177a745e6ddd545b032
+EBUILD gettext-setup-0.29.ebuild 1044 BLAKE2B 0699a94e54ffc5e3098f5252a65a846c91e8db6b14115c6436b5fb61c884dda2e361ecfd2ac26976687279bf3b7749287d2e81b1d6407b0296d13bf1865fc9a5 SHA512 5e18394ada417abe990503c7320fe01fa5e749bb1cd26c7d6f6c45b4f454054b7ec128e5a1447d44c506ec988fe5a87c4400c5f91108f177a745e6ddd545b032
 MISC metadata.xml 344 BLAKE2B 14075c722372613eeff2cb810420e1e0ff7cdcf4ee1ba748a0b615222b88b13a0ecc01c9d0ca1aab71c0bb28359c18682b7402444caa01100c3d8381b9b13e08 SHA512 f7f8c8e7f745313b74340ffe738cab426f793f452106e0ae70f5e73a3a745f1b9ae7b1b70b5951f1d5eb81d4e61851845fa53bd2aa3dab8362f330e6f8d79e9c
diff --git a/dev-ruby/gettext-setup/gettext-setup-0.10.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
index 0084453024fe..fc46abc80d1f 100644
--- a/dev-ruby/gettext-setup/gettext-setup-0.10.ebuild
+++ b/dev-ruby/gettext-setup/gettext-setup-0.29.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -20,7 +20,7 @@ RUBY_S="${PN}-gem-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~ppc64"
 IUSE=""
 
 ruby_add_rdepend "
@@ -30,7 +30,11 @@ ruby_add_rdepend "
 "
 
 all_ruby_prepare() {
-	sed -i -e 's/1.1.0/1.1/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/1.1.0/1.1/' \
+		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	# Avoid spec with specific locale requirements
+	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
 }
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index ac492f679f6f..f77c45ba7c0b 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -10,7 +10,7 @@ EBUILD rspec-core-2.99.2-r2.ebuild 3051 BLAKE2B 2c876764fef17f0f74ce528cd2565483
 EBUILD rspec-core-3.3.2-r1.ebuild 2903 BLAKE2B bca11f49b39caa89f3f7f651d1105787dc1803ccdd9b3ff5336d9446e006ff1bcb6bbdd177495767a087ad1a293630e02ce96789c7df961fbce758108a9420a8 SHA512 776100a89ec88881475d1cb584262a02067a8ac54413cd2cdaa768af1cfbc0b5a00bd5d26287225bba69cf457afc6a1e41291abfdb376a47fc57d45f5a8a0b55
 EBUILD rspec-core-3.3.2.ebuild 3044 BLAKE2B d37e3ffd7a3dc560fad667d36c536caf533c97b11c5469b6578be3d4356de79d2553374f1d6bbce97700cf820d68c3fe2c094f19ef5de1eb26ad999151208c24 SHA512 fcd6ffab8f1df675d54f7d72ec6efe9ccdd15c4a06ef5f13133d2004e0bce587b467e7a61330d102498ada2eca529aa7f4b05b77c990b8a91da07cf0b8195f8a
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
-EBUILD rspec-core-3.5.4.ebuild 3172 BLAKE2B bdd0a89cbf2bb3a3cd0343b8a0aba84b7873e5b6be3d575cc95c3068defb63794253d48ba62dd5eb4d716b1280c98bbbd7d366c8dad213bb6d7d73f00c939cf0 SHA512 54ac018fce091ab9454c34d6a14acc693ca2b3d5fa6a59c1b579b0092ae5c95c8dcb53652fc03743081c58cc1b208aff0ef4ccebd8599356f41090a7965243ec
+EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
 EBUILD rspec-core-3.6.0.ebuild 3246 BLAKE2B a355b0b37d5a30e603cd24bd9795d5fb9961d249c928a85e089265ac86009ed4be963cf15718ad672320a3160f7679efcd749226574b1a006a90de9d85f3ee0f SHA512 1b6d34c39c4cdb18261f16e78d988fe18f60a81a72a34a09fae96ec7f7a29c6b2d7ae01a8a60daaa26c6d96d1d6d607dee91d7fa728dcd7e07671a69b0391f5d
 EBUILD rspec-core-3.7.0.ebuild 3239 BLAKE2B f894a7c9e1e777bef0bc6386ed876aca414642f2b2802b44fd86d145c2c5ad86701d402ba2c22a664ed796f9e4a04c8aa2b51b8bfe94d78202f0635b15bc9c79 SHA512 ba0dcccd775215fe8e61ea0b054636c62499c206f3bddd5302f771808f0dc386c270a2b821f6a1ad5ba9a2f6a3a4a6205c47227e35ef8798a569a35a7c171271
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
index 8f77904809f4..0c937d52f425 100644
--- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm 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 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="highlight"
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 7751679bcdbb..6217aa392e8c 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -7,7 +7,7 @@ DIST rspec-expectations-3.7.0-git.tgz 194071 SHA256 b936be3a5483de4854cf6012e506
 EBUILD rspec-expectations-2.14.5-r1.ebuild 1297 BLAKE2B 44073a50314b9266ef24f132115479ee4f7ac0f019e5118e3a97ad90e324fe8f946d91df46547c6e146ae1b566c075a030f02191a50dadd4130c6166c269568b SHA512 63879f846e1c7066e242f3c90071997f835bd76dd6c9933a8eb7ba6d3e4f9a1316315e57ba0f5760783d265ec7ee101866cf1c5972d7ff23dbccd819f9340b28
 EBUILD rspec-expectations-2.99.2.ebuild 1690 BLAKE2B 47347c7a6fb2f5c002b2a5a5f8ecaa24027d2dd65aa9331d3eff62ae9a2070a449b1647ba090d987f568fb422e12eac83db6adc17fc06ee1e06f2e8b45ca3882 SHA512 c045ab6236bacabb7ef4e622c2b56159c12712f82013caad00a4bdf1fb637ba98873dfa7bd3feee574038366c2eba81db2d3a009f8daef5d20b3995d076489ae
 EBUILD rspec-expectations-3.3.1.ebuild 1811 BLAKE2B a638b1676d002bdf4d5234de6aec2ac25b6615b1c8b303eee9864fbd9e626b2874b1658090ab550c870266d63a7f12e82d9fde2ea187683b23d60495c90d0f19 SHA512 f0d3648237464917add707bae606ab471aa1edf5fa5d59f2067378c1c5b1f761542dc9c6c28401bf599e36e3a44bf79d35b3b2ae2bea8adfd2ffead747487f87
-EBUILD rspec-expectations-3.5.0.ebuild 1316 BLAKE2B d3bd150c5e39a54ff75515e69de8b45313d2499f8a9455774e59f5e90770cdeeccf44646023678b1111f3eeb41a84c43308ed188fc74eccd3ca5f428376bbd83 SHA512 b1478417e75af503f4b05cb6dc21a1901ae4338bc2c4fb8f372bc2e84840233ab8069e6ccd0fa265ac7462935d9886e9722d18cebd74a50b9bb162aa6abea7b4
+EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1331 BLAKE2B 07599eb3e093a921cc7c9039c6ad5960a430b8cb5624f4078e739c9e653b340a538317d4bb35d0171a10e74f7284cfd9c7f7ab80e2bf289963bb3485369faa30 SHA512 b0121724e5114884d30a64775da3610eb8b94d7fe86f040d70801a0d187a38c44924da2f75f85ee0de33b497c452680b6a0c0a3f7c7bd5343c6ddf97a6b4be9f
 EBUILD rspec-expectations-3.7.0.ebuild 1324 BLAKE2B 3f81b93f4c96c108c48ce195c1b6ebea561aa37b06205c2c7d2d5d778263fcc8f9bba31b457d4d4cc449f82a7dcc6971c36755ddf7a1f5b3f518c489dee5a11f SHA512 c03be394692a773fe0ac6bd1816aa6ae3da84559226dfc29ddd7ff725b11e7af7f3b079ef992b68ea3e891b25ead9f30e1474e68583c9abdb0052238a335bac0
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
index e1ad1a97f5c5..8d7056ae2520 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm 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 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=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 963ed137212d..82e1b98abafa 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -7,7 +7,7 @@ DIST rspec-mocks-3.7.0-git.tgz 189170 SHA256 293a5406099d6767d7ffbdb01c57022e6bb
 EBUILD rspec-mocks-2.14.6-r1.ebuild 1285 BLAKE2B a404deaf1d6344bb9ef7b72bdcb1c82a81b7ad71973af40f0b8fe63f516cc9a133993b65763e080eb7da7a881d8d5e841a8206e60a91fc4290ea9652f7cf32a1 SHA512 f515fe9492f41766c77a8b57bb4bc37d60f2d7c053a877a9c497e49b80df61320b4f01dd6ede5fbe4e4686304327d9657518ed06d820becdac5e2d1234126e36
 EBUILD rspec-mocks-2.99.2.ebuild 1483 BLAKE2B 7069c238f8445cc5bdc3fd4bdc74ccee3b37dc53f4f4df9da9167bb58f4421020847f2d4b5d64d0e8dca71b044e06f4967539249a81e6b8510463670b8b5a7da SHA512 92b0a4872cc656bba07fd95d1b4e35fd793e06e8af5be17803364a494c3ace76e55b0be4ab71913ed2effc4e74a5f5fa363b4bf3349d70ce8a5e35789a81ddc9
 EBUILD rspec-mocks-3.3.2.ebuild 1929 BLAKE2B 252e12be2a146046d9b94883fbbd0108ce1bcac42243a0adb8e103fdfcca9feb36e5f5d1e5592416d9bf58d456c840376cf5e038bbae546c5300ab2de745bfa4 SHA512 7471395d3ddc2899dbd1e6cfa970b58bc439de24dd68c01044015224e86868268b27784519439e249c16c82948c217614cc3d808c89a171b6808bfb789a87fbd
-EBUILD rspec-mocks-3.5.0.ebuild 1340 BLAKE2B 82953663fec71de75213df49639ffe7d2fd066e86470f8eaa52a407f5eec802282fa9e453c4ef722e67928e459c1bc7ac1f434bbdf5b084b293808abfd8960d6 SHA512 f58f8cd79532ddbcd464c9fdbb2bfe341b30df95049edb860bd5aae00c898a68dc8310b9896fdfc663bb9ef8f3240bcf490b7dea0bc5122536bc37e7ba871267
+EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
 EBUILD rspec-mocks-3.6.0.ebuild 1355 BLAKE2B 0db9bc438e04f5922283cf0a7e2f7b8480718a5472543e640cef8736bb764bf6d1905454f6fa2e84c7cb03700739cbc5994b75de94174ff19db3b7bf501ea6a3 SHA512 03c9a18b08784c8d05a7f8bd4f405aeef96a32f6d9c77439ae0bdbaba84e66af9cfcbcc6dac4a671967bc17f7c014c783715eee37bc3341c836e351122e2d950
 EBUILD rspec-mocks-3.7.0.ebuild 1348 BLAKE2B 869b3e19b0ede06123590895b73b393c50cb32872e9f04a2855bd4f2bdaa22bc3d7155d6b59231f95281b079cf32936e2c613f7ff122c7bef7db1a8cb59c5324 SHA512 9c248315309e319cc55aa0b8f6f0b42b6f08e644ff1bca40362fb7bcf1183bdf6ed1319c6d3edee8a14383de9cc1c8ef11cd1775a4a0ad8e2e52167a4a8ad577
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
index 3758bb78ed2c..a97a1bd3cac8 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm 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 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=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 2c98605b3116..f2ac8a3bad60 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,9 +1,9 @@
 DIST rspec-support-3.3.0-git.tgz 45380 SHA256 cea58331f616e407c4ee25bb0b74bad26dbdc793fd341010d37749dea15e30a2 SHA512 88f0fdbc7609093c8f14bff220a03d0788847315e5ac73c025cd181d84a3ac120c294aca8ffff9a0c11c9f11e35019dc337f9e43fc2c33cabe4856d87e36fa1e WHIRLPOOL 6f355bb1dc71bbb7804fd3d4a4227042bbe0d166ef336e4121730abce52e1596b25b94ae38e72a6284ca2eac6d0eb6146a02f54d08792b1ff5a6320d40524a2a
-DIST rspec-support-3.5.0-git.tgz 59824 SHA256 856a052e7fd6d3a368c543580528495e660bb1ce403333001ba4be48e39a518f SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc WHIRLPOOL ed288c0681b14670e6bbb43c5672d7240c408e98be2927b32d38eb330b5b941d2169c4d3c30b1a0c7f715554f4f67d5399451da466a4a15f4c90c9ce208313b1
-DIST rspec-support-3.6.0-git.tgz 64987 SHA256 cd02fc3b5fc5cf668ead3192a7bd8301b197c9344433b819c5e1c5fc6ffcd0fd SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e WHIRLPOOL 08ee95290280af2ac1bf811e8016888e9e8157210b7e330cece5e6f543200d14215925701e480684a0f2277687dfe8ceb6b5a4b432fe9f5051aa6272913a2001
+DIST rspec-support-3.5.0-git.tgz 59824 BLAKE2B 8e970af2f060344f842664e3afad7ba18d6884ef4a0e5b47ca3f2544f27a80df7227b98e853fea5a1091a6727d075d6a033e23dae930bbad854a181f8aa1662a SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc
+DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd4004287f0f057278b78160465ad66d43d5b543b9039d68e3488752e963308764b74a1343868f692b0ff26559b0c90cd3b674 SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e
 DIST rspec-support-3.7.0-git.tgz 65675 SHA256 2098352c9cead0534de5878580194cf42721e77aab632015804fcea0161d4da7 SHA512 a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033 WHIRLPOOL 7e1950cdf58ff07a98ae5280b953c77150d2580368a3fae9f128f78494d3f287017ded13799ed64bbf540c0cc6d1a108508029bf88bf351f22e12e08bcb95429
 EBUILD rspec-support-3.3.0.ebuild 1031 BLAKE2B 36d93da5f9ec3cf67af172b7b9f8967d9416e1ce94b52fae0696745883fcfded1bde65018e03b4afb45ab894cd65db5a8fa1ca17efe25130cd33908242e0b989 SHA512 4b3bf4541158fad45e7b7b380f50b9030d237e724938f56a7518bb6882459f5d5f9d7cb9e66ce37c777d175a20657cca0adf226624f18aa0c9e99ac09462a79b
-EBUILD rspec-support-3.5.0.ebuild 1321 BLAKE2B 928c98b2b9adda3c23b7e6edddbce38f14097efbc8aca445e957e69f8a89ce72640b505ba5c241fe7dc42ef5ba44aedbe28f4cf2b9d2cb769bab7d05d9b779d3 SHA512 e87d8b25043f2d96a5b303e03421483e1e424dde49f77fec7de5e75ac5e8de3de00740099b03e5c5a50240d1cb45184855251ff9e6e7f7535d41a753808f1b5d
+EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
 EBUILD rspec-support-3.6.0.ebuild 1343 BLAKE2B 38ba6eb482f435a84c51727e0834d95c45cd726d17f4f8b471d7e8fde09c734b4c7e46a54e1460a6f6fb3e4a398a4b77645ae6a5bb88bb0b9a5119ad4cc2d27c SHA512 8669399545c730dc47c50fdaa3929e86563da2a4fab7a88b807540499e5e9b713143a249e58a86e1e9a71d4ca487f07e1e9beff7b6c38a542d839628d3aad906
 EBUILD rspec-support-3.7.0.ebuild 1336 BLAKE2B 69fa85e41eb65bbeee3a4e3781d239d6fa489660f1aa8dc0326d4adb989ca8640ab11cea76730d2d707950e91f3616441720ba4c43d54a425c40e4b27fa0380a SHA512 143f1f5e7462a9cd2f61e690cce3bf6d228db73f3adcc9343032c8c88eb112831d993bac92a52571d0b2ca0ff1056c58a3d8c136a6cc1a2205c5aebd5885a1d0
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
index 464b99983983..708708ce5dd8 100644
--- a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm 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 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-3.5.0:3 dev-ruby/thread_order )"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7746192300f..d164298eaed7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index e04012310caf..70a6d2d2d615 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -2,12 +2,11 @@ AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c
 AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205
 AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
 AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
-DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
-DIST catalyst-3.0_rc1.tar.bz2 874429 SHA256 b21eabc059ef618b617fdd0fa7c558878393d58ff66ce77a7fc6ff87384608c6 SHA512 ca33a1142785f10471e675c9dce784e1f92d6029f2fcf82d2fb1a14292e7aa9063e7942e187faa5d4253f316c032b066a6aba0f32e29cc0125ef757654cbd845 WHIRLPOOL f7b3e7ea61c1e590141cc2ff1ec1883e8b07727ee52c2e1d64f8fd371312d1ef84806f5b40fc16d2178b4b9ffcdcaa3d4d3cac0e4ef52625e5f41c8b0a3ec25e
+DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
+DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 EBUILD catalyst-2.0.18-r1.ebuild 3129 BLAKE2B aab19478081661644cad7ea0614ebabab27086a52f5bdedd85746a09d9495291deea1e8ff77d71d86402587eaab230cd4360113b0a97d9406423b73fbbf22476 SHA512 c70736f23448ff07af62a587c0a3c4c8dabf24e35dfe3c8227c5d89ca9063adbb4bd2a1a7c9749d2b21435f7bc40651c30a00e95a23ef957558fead030b7d31c
 EBUILD catalyst-2.0.18-r4.ebuild 3297 BLAKE2B 77ddebef5817f7eecef4bfb4c4b90c2b2145b09f512f79cbd1b5e30109b41d9b5c5127c6bfe892eb3dfb351e9200007ab65405b31fca8fe39c10d6156d98761d SHA512 e397fb7205d4bf4823b5d328fb9059aa37ed8ad97deb2fa0fd7a7b1cafe694daa2f9f5705ff1a83905101b9679755b875a79063039a63743f6ef2e96dce4efea
 EBUILD catalyst-2.0.9999.ebuild 2930 BLAKE2B dbb778edeca28bda47b827c9cb2ea2c5e395df127e547a3a4e36aa64eb890700b9c6db0d160d7626a9e65fb79d7c53186a3407228a9f2140d2db0e2b7dad262b SHA512 0ce4efc9ff2ce0b394df62b9acf62393d7b277c61067439c3bd095ec0b362c140abdfb54329818e3a3d7eb2f97e1ea9954698eecaca8d093e8b4e5ee5835192f
-EBUILD catalyst-2.9999.ebuild 1537 BLAKE2B 6c66a7241e8704151dc096bed8a492bc79307ea1ac2b740e974fa20f7360a1555966ed77e4b1a6eeea2a327f904c8718d2c723c9627dda0df0eeab687a556747 SHA512 fbf47ebd92a551a9226aad367c5a75cfc079458ef91bd636b870e96376a9cff639540b0e34404f9b3aab5f7a11a33ba4bfb4aa77671d5932e750f084ad671194
-EBUILD catalyst-3.0_rc1.ebuild 1605 BLAKE2B d73cf07fb159d4e8cfee1f543e4d5222af0f3b5e72436b051641bfcaee60db59c2cbb749c70da475e41abfc59b70e461bb4826e8331312f672dc68a32d217c8d SHA512 adf6657e8bf659b7958da18b9088e4b655fffd161aae9e99776db76faef7d8d7ef3c28399038c4324bc502bf2f3ecdbf24d5ae3144bb317930add08d73592e9b
-EBUILD catalyst-9999.ebuild 1634 BLAKE2B babf92dc870354904596967b2b7172fb81f15c33556aa3c616e61845c318dd798d94a4cefb685daaa1acbd8c84676a992760be8ce783f1c833785b836eccc5ad SHA512 913a05a3544fe93f8127c6cced635fad43434fbb01d728b12152ebcc7924daea3b57124265a85f93bad8e43d6484ae4a77556041b2b9ca16a1e3ce7d2e86c1cf
+EBUILD catalyst-3.0.0.ebuild 1690 BLAKE2B fba4e43f89bac9c00ee781ff3448db711922deb4e2b84417c331cf8777fbf8c5e5706fa1273aa14ba84336626fb74097b7ddb9eb4eaa210d716fc7708e50f575 SHA512 f03b06da6acf658de5a7c6b5bc5aef1d3b175b225cdd056a303d02f7c996f06e805fdea03a0f20342636f322073ca6f3078a35194860e17b906d73cb5b05aa98
+EBUILD catalyst-9999.ebuild 1719 BLAKE2B 87891f3b0e74f61e8c9a7750f78bcc4b84e3dfbe83c1750caa5dedce695262133208a66cebce62f957e7ba31526b4b7ff4c305d95540417d6479902e65b5f8cd SHA512 2935800e7524a59decfcd1b940415bfe309f0e6754bdc17bdb66dfe361d9b9b7fa80df6a079648a9386057d5449437bb0079b9e89d9000033579b854f20df746
 MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
deleted file mode 100644
index c5105d8669b3..000000000000
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	EGIT_BRANCH="pending"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.5.2
-"
-RDEPEND="
-	=dev-python/pydecomp-9999
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	ia64? ( sys-fs/dosfstools )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	python_export_best
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all(){
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0_rc1.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index 920665f9a5ea..25437e6d4b09 100644
--- a/dev-util/catalyst/catalyst-3.0_rc1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.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
@@ -13,10 +13,10 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index b257d2ff7661..514a27d90a60 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -13,10 +13,10 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
@@ -35,7 +35,8 @@ RDEPEND="
 	=dev-python/pydecomp-9999[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
-	app-arch/tar[xattr]
+	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	x86-fbsd? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index ebcc76bb9f72..5ddc7a976443 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,5 @@
-DIST goland-173.3531.21.tar.gz 213040527 SHA256 5738129cb5ab81428cf6fa0ec18e97221b1303d966e679e575a0ac8e669170cd SHA512 db2deb4e52fb4135e3fb27c63a181c34acddf61dd2bedf81e50144a85b3e9bcb1a7490532b6841815e2b888c660aa26bc8c3176f83bb30bcf20ec568cdfeb65b WHIRLPOOL 51502c1d35a582601378a6ed403c4c84d36418a340f00479180143a1eddcae05832242f9bb075ebb63c906c5f0385a5ef53a32b4d2975669a8b54266b9778e8c
+DIST goland-173.3531.21.tar.gz 213040527 BLAKE2B 57fbc0820fb09aa23ebad45c9f6477469f71f84d3abb9e77eba45a90c89695754a7800ff768b63b815b48a1aa35631af0332a0a9af10b3e6dc6d22c587aef30c SHA512 db2deb4e52fb4135e3fb27c63a181c34acddf61dd2bedf81e50144a85b3e9bcb1a7490532b6841815e2b888c660aa26bc8c3176f83bb30bcf20ec568cdfeb65b
+DIST goland-2017.3.tar.gz 213261483 BLAKE2B 4c84d073265fc701dc0f34571850c2fab05e2e07479d9dc886af660a097a361a5532cf9078569e9dc8cee0322f92544683e9c05689d025bb39de925a10e05c2d SHA512 5fa8d61850e31c1db82e32d9ccccaad71fc00db85a31bc423384b443819d9dc6f3ba11399c580d8eb9c3fe698b437c13072fc49126359bd405b7d57e12c92328
 EBUILD goland-173.3531.21.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
+EBUILD goland-2017.3.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2017.3.ebuild b/dev-util/goland/goland-2017.3.ebuild
new file mode 100644
index 000000000000..3698daaba68c
--- /dev/null
+++ b/dev-util/goland/goland-2017.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 13acbd1744c2..30ab835efd36 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -5,11 +5,13 @@ DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211
 DIST gperftools-2.4.tar.gz 890402 SHA256 a73c2d066fb0d8e5a9102c0c17eadd8041f9b43b40b50faff54db01256772f6c SHA512 77198c150ee26579adc8f190be0c4ba90a9e3854b006c3aa9252b5863b1fce317fd690c6aa0ed202c81f0bbcfbe2d5f8a182263e77b7fb4fbc6b3e8bfffc9fb0 WHIRLPOOL 4b74a6074e1d0e0f6c5c3d8487a73045849237db93abcb5f4bb4aa7f40fcf9355d0cb1702335904ba6153ead62cb5a6df264d359bc1ce32fbb13fba4d2f2ddbc
 DIST gperftools-2.5.tar.gz 895753 SHA256 0256331e67e8be12995b57183ec6affd071231f997bfcb5d5b050f86d4ad577e SHA512 974b86eadebe0437f4b7cf51de84afa315390cdcd2a88c8ccc8448b0b3e98c2241d89b4987b5fca1937102ae00a43802d9d06d7b11272e3dfeeaa23cf58ad68d WHIRLPOOL 4fc82910585107a2a879cae1b83afdcf98a39c3c7cbce3e8ba28b7b00ea1f638bb795213b7a6330bb311dd399bd7bcf34b3705cb8f75921ac1fd9ce3c0d1e8fd
 DIST gperftools-2.6.1.tar.gz 907916 SHA256 3a51215bf0f0c1eedaef9cd377fe6b47dddafc3e5a66d292abb176e1ed36aab8 SHA512 49c1123ef8e297381e30fae6fc2391539ac5e1d3097b3f9f59c21853589152e248e92be0739bc50da6e5542f2638a9719b88f2d454221f463915d89e569776d2 WHIRLPOOL f93beba285703e199b27fd03e9c16732dcd9b625a16daad02c255392627dcf57b093a767bc645716b5f3395446c6181678c775b53f7d2dc151a398dad737a761
+DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
 DIST gperftools-2.6.tar.gz 906841 SHA256 ff07a20a522fc729b899c542fedd3156fb1600973786542917675f7634b4905c SHA512 9fc32066304b76ad323e90ce2e7b437e7f1a5094b8d40a0e3df4d317fd57b4c048a19dacb7d148bd40557a080b0b82fe2da8ef32ae5511735ca7118e06b1ee38 WHIRLPOOL c91ffd09e9fd3202c17813d27370b144fa4140a6bd62b3e6c662557ac674c16575edcd50313d2cd342834a6ea5e799b96dca72ff600714486f9515bcc0c538c1
 EBUILD google-perftools-1.8.3.ebuild 2133 BLAKE2B 4ca39c813c2ad0ac268ad4e062e242eef8742ee3a3ec7800f4dc769e8ca798db61154a8a7426aadc7bbf400e5c340fb27a28dc0ca7b67ae69155d9ed4b2aea9b SHA512 205e18c8d5cf0ff78d3f5a91daaafee95b4395cd6a68fa3d4d606a29b5bd720f1a013a3398e6c9eb4b660e1bc614bc5f269a87cada037c09bfd5f80985a530fb
 EBUILD google-perftools-2.0-r2.ebuild 1803 BLAKE2B b81145202e20964c9c5784aa1b7b7afb1bef69659339654375a2019732d7696b2bd6fe0bf0347c7f559146b7c64e4c203ec7ad7626ccd68d3f030b488005a92e SHA512 7fe925ddae89c431f7177c4bc97dc2e5a663452e9fde34d16f28fd5dbfa8e584b961362cc1f65ee726478b54a2d000b15ef3bf81ce4e10c11aee2a78990e3a58
 EBUILD google-perftools-2.4.ebuild 2297 BLAKE2B 7c0dd1e856d745ecf215d3974f1bc2dd057f7ca3381bcc5ca7b8d2ce800b029c831934d27a938056aaa724a500f5799ef792155c2e371ea9fe2be4f0cdec0995 SHA512 026a68d5920847c00fd1af24397ce45575dab9e16f569c9d55b7b0424511cab365be429e33bb7d74ef70a57c38eacc825d3809d44c204678b046c9a76302a460
 EBUILD google-perftools-2.5.ebuild 2239 BLAKE2B d3fe7e61c1d22037f62c0932ee5738c15a4e960865713aec4a4d438b6de94113652968e18cf6d340da07e83e40373d4a4f637e4241d507f54b389ed52a23e852 SHA512 a82b99fac33b076300aa37a7ead134b3ce52468e8a4a7d1ac8721a49459cddce81dcf7a816361d53b6cfaf1d33500a0c39417713275bb148d7b7197cfb46a78d
 EBUILD google-perftools-2.6.1.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
+EBUILD google-perftools-2.6.2.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
 EBUILD google-perftools-2.6.ebuild 2298 BLAKE2B b28b5cc6e58b46b0d1fce540346f83355626dd7711dc1aa0bfba9016a25745bdbc8216e0c7514db9758282c5c27eb64e87ca721ee93838cea1766c134bffcbe1 SHA512 c7f8cd8b270f7ac343e63f620da03a0787c8c20271030c653eb1d5a5ee42e6666f36b2652c8c71fa0785d87d67b82f9005b7f564d72ccae159521a9cad8e75cf
 MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
new file mode 100644
index 000000000000..708d67991674
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="gperftools-${PV}"
+inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="https://github.com/gperftools/gperftools"
+SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# AIX ppc/ppc64
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="largepages +debug minimal optimisememory test static-libs"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS="docs"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		MAKEOPTS+=" noinst_PROGRAMS= "
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	econf \
+		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugalloc) \
+		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sandbox is enabled."
+			ewarn "See https://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	multilib-minimal_src_test
+}
+
+src_install() {
+	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/gperftools/heap-checker.h
+			/usr/include/gperftools/heap-profiler.h
+			/usr/include/gperftools/stacktrace.h
+			/usr/include/gperftools/profiler.h
+		)
+	fi
+
+	multilib-minimal_src_install
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index af8081b9ba61..4bbae381d0e8 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index e7d8c8cc8486..fc18897073b6 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -17,10 +17,10 @@ AUX cvs-1.12.12-openat.patch 761 BLAKE2B ea0ea24adb27599ccd2f375ebeb008c3c2cbc24
 AUX cvs-1.12.12-rcs2log-coreutils.patch 557 BLAKE2B e47fc3072b5ba8728752a5312be67cb1579d2eb1b8a0c5b9e279c9ea3570adcf73f4b2643bcab48cb56e2067475cbe576e041e9dbde2604c4e209085f7c3ad16 SHA512 73c3506fa670b00ac52363efa2a2fa34203108d3dc112400e52f78eb7d83967cf49b11280d6c27a461f79a9c38317b41b26dd1f67d10229dbcb6c2ad9d43b521
 AUX cvs.pam-include-1.12.12 106 BLAKE2B d9daa13819af5eceb0fef5afd355139b23993bbd6be7eeb5a28ca96a9dba3e987b6ac7fda383ba8b8139abd56e4e7e4ffc725931019e6c7840f96dcc4403d854 SHA512 1e72da3f959433e59d0153ff09e53a79bb68793506456e38d7070ffe4fcf6d596fdc3740dd2325d626a8dbd356dd11d93fbd5f220515f2435a94b90bb5833fb9
 AUX cvspserver.xinetd.d 282 BLAKE2B e9d2196b5c3286579c3eb2dbdc8ee4f8be46d4af4c54df8e1aa02ee0d9226334c8688e82b9786387a76136d24b365a365cd5a4dab5e8d153f3d5a27a7e07caf5 SHA512 6845a5fc38ed9d8f9194f14137066c3f2640f09ebc1dce7e9fa7c49761534003e5b1c59593496ba9f88a6c9b1196980bc145a2e2fdcbf662360d1b1ca8821411
-DIST cederqvist-1.12.12.html.tar.bz2 137581 SHA256 6bdd66581ec363e05313a14db27cd3c201b547cdfc9ea2f8edde74e78301f0f6 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3 WHIRLPOOL 41dd1e0d944a02eeca10539b87b5cfcadbf4fd5923c872aa86e5673bb6a98f774d5378e8b4f1c2e6c6a62e6dc6a4d02c69b5e51ad03da899903070effd62adc9
-DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb2447c41016fab6f657168b041ce SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a WHIRLPOOL 88d015117c05716df6d0cdc763f16dc488f0641624475e9bd33478485dd32e36a7ee5c49a1789ebdd173e665ae5963e75975342d7308e8e453adb65dd31ec6c5
-DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6
-DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c
+DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8eabf6faff1fccc8c0f741b0d5c59882d60e91cae08aaf2449a9e5553293c564b37381d52b71110cd45c7599661dbb8427a96 SHA512 c4f6bdc294b719c1c9f6e8b7d1d4faa9e2aafccd37924e9d4772f8d802da3e7f5ae1778b295989db256b23bb1d0914023db7237adaf07833caaee499ae6b6fa3
+DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
+DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
+DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
 EBUILD cvs-1.12.12-r11.ebuild 3007 BLAKE2B 210cf09bd7e860c202ebfb1478f5373bfe65c7bf8cf3b44249e3caffe440e28508cd2e5adc00f32cdb28fe158924cd5234a1bd4d87c91c202683ae1b242c3042 SHA512 d7c9875e3990bea839ad68c5d3620dd4762841386554a52543c9cd36206e393f08ee277514cd48aaa6d1bd370b6abf77434d80364c6897029cfee6d6485bca00
-EBUILD cvs-1.12.12-r12.ebuild 2947 BLAKE2B b2b26b222bd61ea0613eab93849f65bb98953136de0ac2e2dbe9c1d6cf1d39054e802cf4676dd180468b81dca43c7ac2c82a20da72e6271c8a79b6ee1e6234b4 SHA512 2e030b4698d8dd0e9624db57e277c16ec9a05b1a35c688514346cf99c65c0e0c2d6983b4476663dd76ce9abc159f405f5c9cea1b58afaa27044d28b888c2d68f
+EBUILD cvs-1.12.12-r12.ebuild 3003 BLAKE2B 4dd68db1fa0149a28c983c116d69bc344bbe3f1dda3da5c0e59eb80b5a42672ea7d92705bbcb52028ff3f339fa3b18cf0afd132a5d6aeed9d2e42a1ef1a09767 SHA512 13379d493918e3ecb1788b73de23379e5e408597ebdd8657ef99c5181d54f69d1008012bffe9924095683ba200db128cb70fe24a294c31b38d7e98e09c362851
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 0bfbf53733fc..fedc3d363758 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -51,6 +51,7 @@ DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
 	PROJECTS README TESTS TODO )
 
 src_prepare() {
+	export CONFIG_SHELL=${BASH}  # configure fails without
 	default
 	sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die
 }
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 0cb4867c3dde..253224cfd386 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/fakk2/Manifest b/games-action/fakk2/Manifest
index 99c1e50f9609..90fc2f79894d 100644
--- a/games-action/fakk2/Manifest
+++ b/games-action/fakk2/Manifest
@@ -1,3 +1,3 @@
-EBUILD fakk2-1.02-r1.ebuild 1683 BLAKE2B c34d0b44e4e1fc953887037a7f7c7805f7d1d80f6cfbafd4527ec8d987989bc53f15ba39e60683b54fcdcaf9f9bbbeb4e6ca620c39503d02967984c9d0cc137a SHA512 99fddd9578d61610ba8925899205bdc4ac336a238ee078f6b8e2ea295b9f1b425233d232ade2a176044cdf16c02033a3b640535bb1ae8a326ab1d40a21b78236
-EBUILD fakk2-1.02.ebuild 1762 BLAKE2B 885faeafd11b7ab64db27a0935a31485828b0f31f339352fa6df487c288903c0067cabd3a9456524ce13b51cbee92ae4acc086294bf82dc3b5d39e63d1a761ae SHA512 5a8bdebda18745220e301684c858015378a572fb47873e9c4ad55cbd7d7c793bc7666835273dfa2b9205d478423f58b80dae493f90ba0a0523e8c48bbaff28a5
+EBUILD fakk2-1.02-r1.ebuild 1662 BLAKE2B a5f89834da712fbc95fbce9934a08b51c806937042e0d8df372427e6a24293455c7335bc1b3f354ce0140630b5ce2086904032c718a60c924e699137755727ea SHA512 60f1588dec82c4bfce2c02ed0ee8668d32aeaacee540084611f2b85aec46c1964cfb3d73e604b6bc7ee2187ddd6c3ec5a8cc0b4ed1921aee42f14181f9a336c8
+EBUILD fakk2-1.02.ebuild 1741 BLAKE2B 48cf0b9b341332463216650fa3ad33a162ed8f83f0030fe9058cdee509857b95ed98f4628248bba24113a5970fb7b615f393463f43129d77e9914bab58e031f3 SHA512 134559832062f28ff49a6ad2c87e0fb8d245c09a211cb24338e39508e4c8e336286cafd9d99fe538be8f557bb8427a8e3557182b3b7090b8efb79b0d34fbb624
 MISC metadata.xml 1206 BLAKE2B a3c0be20590459e2401b791c4c1211f7155d4e76f34757ad180c9626729f431ee77a00a30b25076cef69705e64cd54ca581d147132f2c8323b9053013255d5a8 SHA512 786927f7a429e4ff1f1097144f41b832b7d8bd8fd1423dd5587d3c496a2ed4be66aa34702e360c702f536429ceed38082475529392c5e0ef389aa431d2595432
diff --git a/games-action/fakk2/fakk2-1.02-r1.ebuild b/games-action/fakk2/fakk2-1.02-r1.ebuild
index d05c9b67b251..b038c25d14ee 100644
--- a/games-action/fakk2/fakk2-1.02-r1.ebuild
+++ b/games-action/fakk2/fakk2-1.02-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils cdrom
 
-DESCRIPTION="Heavy Metal: FAKK2 - 3D third-person action shooter based on the Heavy Metal comics/movies"
+DESCRIPTION="3D third-person action shooter based on the Heavy Metal comics/movies"
 HOMEPAGE="http://www.lokigames.com/products/fakk2/"
 SRC_URI=""
 
diff --git a/games-action/fakk2/fakk2-1.02.ebuild b/games-action/fakk2/fakk2-1.02.ebuild
index 514a904b6553..1c8e944aa396 100644
--- a/games-action/fakk2/fakk2-1.02.ebuild
+++ b/games-action/fakk2/fakk2-1.02.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils cdrom games
 
-DESCRIPTION="Heavy Metal: FAKK2 - 3D third-person action shooter based on the Heavy Metal comics/movies"
+DESCRIPTION="3D third-person action shooter based on the Heavy Metal comics/movies"
 HOMEPAGE="http://www.lokigames.com/products/fakk2/"
 SRC_URI=""
 
diff --git a/games-action/trine-bin/Manifest b/games-action/trine-bin/Manifest
index 77fcf077d17e..cbceb0b6f079 100644
--- a/games-action/trine-bin/Manifest
+++ b/games-action/trine-bin/Manifest
@@ -1,4 +1,4 @@
 DIST Trine.64.run 648471997 SHA256 1c9067cb19e3c954b460b4df27e6ca5d80b31c7ead49bd5779dcbce5528177db SHA512 400200a3ebc6003545df460f9a8af7fe4f6f370655432c66ca8a5ceb10e40bf205e81f70cfbe3fe7386de9ec0aeb5e23f02590776c2b0f35a32f9fbc1012ea3a WHIRLPOOL b6610f53e8e4079383de9a664b8cb019fbe9daa7cdbb204116c3e34b27327325dfdc39649185076524429f8ba2fc1a0889f9006e6873db65c3f73784f440e1e9
-EBUILD trine-bin-1.08-r1.ebuild 1633 BLAKE2B fc2a910172ee54c4ee8828c34f1bfd39ab442b2f16ebf2aecbf5b82c162d4d3fcb923543602b8aeab39ebe271d5cdb635489717fb53070e46ad91ace61319291 SHA512 a1a5287a3590a08e95a728bbdc1d1f0ce94e37b4c4136803dea5ce051f018e7c21dcbfcc912068d76fa5081f340e48e6935cd51ea737cafea00661bfdf295f60
-EBUILD trine-bin-1.08.ebuild 1667 BLAKE2B 2d6bbe3c70360b0eb9ac9fdcd2dfc736ac7a0e6b17ec7c48fa815482c5f65619866ace6d7321a83baba21ea389976de524a0e3f91cc903836d332b047a4aac0b SHA512 5e395ec3eba04aab6367b1fe6933b010060595593aa082d8e5f6820c538131d218a4c1fa796cc1df2a5ac196dbd9bcdc5de4260ac4feaf80e9586e3875b96ae7
+EBUILD trine-bin-1.08-r1.ebuild 1625 BLAKE2B 4a666d9cb47809ac783efffbb7ccd6b41151b441cfa95d29ff25f293e6a1579c8afb8cf68d59404cd6983142077723227eb2424f09fad976fc6ca5a6ece6b158 SHA512 a5af36f86b67b8f70fc0e68e2bdfc2ba046b55b76787e67ab31074d2bd3f6213d543e21db027cf738793d351270a8dc8c2f31420c7f1ce444a65302bef30fe9b
+EBUILD trine-bin-1.08.ebuild 1659 BLAKE2B bec557808e25da8fcce681ad73cb02bf62f622eeb15aabbe2de24b443ff11264c736bf22ce24a7282348376e1529419fed8351eacea1ef25ab82555dc2d70f6b SHA512 08bbd25f90b6583965c66a08dafc19d87d3830c408554670f70db3864845cb152ce145acff569c5eceabc62cb4d81b118adac0bd517cac8717da8fa4950afb67
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/trine-bin/trine-bin-1.08-r1.ebuild b/games-action/trine-bin/trine-bin-1.08-r1.ebuild
index 2d39d775cb8e..dd00324d01d0 100644
--- a/games-action/trine-bin/trine-bin-1.08-r1.ebuild
+++ b/games-action/trine-bin/trine-bin-1.08-r1.ebuild
@@ -10,7 +10,7 @@
 EAPI=6
 inherit unpacker eutils
 
-DESCRIPTION="A physics-based action game where diff characters allow diff solutions to challenges"
+DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
 HOMEPAGE="http://trine-thegame.com/"
 SRC_URI="Trine.64.run"
 
diff --git a/games-action/trine-bin/trine-bin-1.08.ebuild b/games-action/trine-bin/trine-bin-1.08.ebuild
index 076c1d9893b8..0a3658bb2562 100644
--- a/games-action/trine-bin/trine-bin-1.08.ebuild
+++ b/games-action/trine-bin/trine-bin-1.08.ebuild
@@ -10,7 +10,7 @@
 EAPI=5
 inherit unpacker eutils games
 
-DESCRIPTION="a physics-based action game where diff characters allow diff solutions to challenges"
+DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
 HOMEPAGE="http://trine-thegame.com/"
 SRC_URI="Trine.64.run"
 
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 883803ee2183..ca79c16decfa 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/bloboats/Manifest b/games-arcade/bloboats/Manifest
index 9d3879f0464a..9797133535c8 100644
--- a/games-arcade/bloboats/Manifest
+++ b/games-arcade/bloboats/Manifest
@@ -1,5 +1,5 @@
 AUX bloboats-1.0.2-gcc6.patch 371 BLAKE2B 615ec5d3882efd0ac648819c997bc744cfcd3cb4cc7f0e3a90ebd39e6754d86625f9987b0d453a0859553e6a3845179051be8b1adfa236b3e6ff75160b2a1432 SHA512 30928398ed428c039a01e98dc5970590a11a9f324dfbb6e8d1b9fa89161d09eda0cac6d03cee603bb493f44bfd315a036c2d73540f7a775820e12ce90f1651a6
 AUX bloboats-1.0.2-warnings.patch 816 BLAKE2B d3b1418c6e8290bee5e2966acd4ec09acf2bf0884a1db6b2c6befb4f54fc927a99823e0cbaefdf4e67e2637bec759de4d5911efa817c2d630f2dbf3267f91bfb SHA512 1e4a4fcc6d98da6896bc10c5bf8cf0170020e82ee8397131b18b2498131482a6b5be263285ce9bb0c22fef98ff266e7a9c8a8a862ec24f457dad42f649229d3e
 DIST bloboats-1.0.2.tar.gz 7592902 SHA256 4aa5cbba7bae4471daefc6ba058cf6a84c62a4c06cd104a525f9ea1108787ccd SHA512 456339557270440ed4efc5b5cc217c1d1f967ba8ea630f5d9557afe4f4a6cafed749a38596bec0c5daec60cb87e9e8cf72c3a73c604e7777b804d07ff352f1c2 WHIRLPOOL a137be75f50045d34c66e1f14e10c59d8b1109813fa0a48f14e6232b6c8065be59bbbe8b52cc70b1b5b9b9a5c1745736cad452b386f3cfb64e6a99e0d1be5489
-EBUILD bloboats-1.0.2.ebuild 1200 BLAKE2B 55818539774489322fe623e27b525a1d1b998cafbbed67b50561e602d79784edb0dc46ac23fac3488bef036a3e842380ac53ee700728d729dffb22642ed15705 SHA512 98c75b778ae35e5954c8572cb47eaf2214afe34746d42692f2ed8a38640212aadd911275084a79d9af744be1fd8b82f7097fe058411941b4ca6611539b46cdef
+EBUILD bloboats-1.0.2.ebuild 1186 BLAKE2B 5fcc5a03e123afadeaa541f8b85d1f8551bc774c8fb1f41e06df0cbce9727f75287bf4a5db5ff2bab1847ce977b665221138bf916ecb577dfe039a890b692068 SHA512 56743bc4da7b7af730a70d0bbdfcebb0afa25276374dc0eb6dc466b63999f304c54bec1b6ff8791caeb027c9bff7b42cfc55848d5959de24036a1ea5dbb4f18d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/bloboats/bloboats-1.0.2.ebuild b/games-arcade/bloboats/bloboats-1.0.2.ebuild
index 0ab9c02f4416..7032a7c550a1 100644
--- a/games-arcade/bloboats/bloboats-1.0.2.ebuild
+++ b/games-arcade/bloboats/bloboats-1.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="arcade-like boat racing game combining platform jumpers and elastomania / x-moto like games"
+DESCRIPTION="Arcade-like boat racing game combining platform jumpers and x-moto like games"
 HOMEPAGE="http://bloboats.dy.fi/"
 SRC_URI="http://mirror.kapsi.fi/bloboats.dy.fi/${P}.tar.gz"
 
diff --git a/games-arcade/mrrescue/Manifest b/games-arcade/mrrescue/Manifest
index 6b9db512af32..c5375a2973c0 100644
--- a/games-arcade/mrrescue/Manifest
+++ b/games-arcade/mrrescue/Manifest
@@ -1,4 +1,4 @@
 DIST mrrescue-1.02b-love.zip 11874167 SHA256 fd19646fb97cf21b7e6eb050ff0c4dc9126189f1036ebf712729f35220c9e6b2 SHA512 24186570c89694889c1d9f17522dd201f20bae2c43237f366397065a7023c89bab3bb9cdc6677cf09bc7cbeaf9926710a3db15818eee9ce8024fedbfcb8fb516 WHIRLPOOL 63ece45482f326f4e2cd64c6003607678b778d93bcef84f7a5894826215f0abcff06ac02052cebddce74d1460d0b7b5b7142649ed178421d5acfd347041df25e
 DIST mrrescue.png 4738 SHA256 03ecc23472af3ae5a89278ec6026b95d967cd679b0cdccf94d9527d77f646877 SHA512 9395e239e300397ed791573758242d75003caaf8c1d66c4f7a0299114ee4f1b40376bb2d532ed4a02fa97f773408ad5ef00ba228ee976fd30ddaa2f60ea80b9c WHIRLPOOL c08ffb6898e0fba6db08112ab39067c9bdfd5fcb418d135a7ba931a552b904b2826afa75c13ce8a0c1cb78106349a11c244462aed0f50138e4e012c371cbd864
-EBUILD mrrescue-1.02b.ebuild 1017 BLAKE2B 504573f47f0cb287b429354bf8e2b1aca6e4328b11ad1ccdd7969127ce98ab95ccc9d90beab3c517cbf5c3d59f5e0c40ff52cf45f867311d3bf47d8c202de9d3 SHA512 3bf346a24970ed34ef687769ab1087a71e80373207717aefdebb243299f1025e25024e72f3cf96ec1b8850a8f7d3bedcdfebed9c5dba0a34e55fc9abb73d4a32
+EBUILD mrrescue-1.02b.ebuild 1007 BLAKE2B e1912f025a27da884242eb7c11d2a57202d436a8dd15e8a48930749946bacde00593dab59aabce834b9517a55361064dbf580f9591a609e6d6ecb3e121434b0a SHA512 d6a6f1d0d214f7e2defd5a789111693f91b49c5e2e4e7cad8666875cdd97423c1c0f3465812ecdc3ff65b8987a3e8d73a9f43004176ed004c2094ce3a56a6644
 MISC metadata.xml 338 BLAKE2B d2f1a16a96f9ca0b31afedba78fec26f446d2a5d8a1984e6040059cf6e62749fc52806089c0d35c5bd08bbe720cc21be6c0c0f8e81dd5d32d5cebae0624a0d18 SHA512 91e9e003edb4f15c5cb51d1ec9e70941155bb7efc4de7d34272e4c3254e27e59081bb0c843909b0831c1888df4051ca9d8315f7f7251c4d3342dcdd7007daa16
diff --git a/games-arcade/mrrescue/mrrescue-1.02b.ebuild b/games-arcade/mrrescue/mrrescue-1.02b.ebuild
index f4128a98d2d4..36756d0277c4 100644
--- a/games-arcade/mrrescue/mrrescue-1.02b.ebuild
+++ b/games-arcade/mrrescue/mrrescue-1.02b.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils gnome2-utils games
 
-DESCRIPTION="Arcade styled 2d action game centered around evacuating civilians from burning buildings"
+DESCRIPTION="Arcade 2d action game based around evacuating civilians from burning buildings"
 HOMEPAGE="http://tangramgames.dk/games/mrrescue/"
 SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
diff --git a/games-arcade/orthorobot/Manifest b/games-arcade/orthorobot/Manifest
index 3e9c996dde07..d91c656278c6 100644
--- a/games-arcade/orthorobot/Manifest
+++ b/games-arcade/orthorobot/Manifest
@@ -1,3 +1,3 @@
 DIST orthorobot-0.zip 3429026 SHA256 744d70b492b9f9ebc8adf43f9131be3f9957d378ae1a8e18f1754dc9ff607608 SHA512 cf73bfd7d136c0d408dcee80db1193c4ae1d418128b8879a67c5fbfc013ce33ffab4255c0ea2e7d2a70f22301192fb77bd5b3105d69ff511d2d5a5b99fbd0cf0 WHIRLPOOL 4ee2364943cf835b84d5ad0daca1f3d204254ae8df4f272cc773da3d7d6561b92804cf26a99158a27622eee61e6f77eebcf50a10152583d8eb4b2d600e7c1e86
-EBUILD orthorobot-0.ebuild 1146 BLAKE2B 44f72c286ab97dfa709bdd264e6e66496a78dc073ec0ac9c897ab858d6d875ba58c8b223066aeda953e35233f96a2fb7d79e6ba9fbfecd932b555db9b3c8baff SHA512 3a2b8e02b378725c9fed3db30258cd6a995ab221015ad012577ea994f9093327eb65284771e4454303259444173f2ee30c7c254827a031dc7878ce8e64e52564
+EBUILD orthorobot-0.ebuild 1141 BLAKE2B 65c8c395f91dfc600b16815093b153fd8841b021f0dbf886158019dcb30559ca9c59cce288e44c0859f25e45cec493fce9f1886c36a1beb8463f3ce67615e6b1 SHA512 a3784c8042f7f8163982bb5c3a10d018014eb5ff54630193c684fca90cd4f5b03a733fdd156f0abebbe9715f3e381ece5e36024dfa900843bf705c729645db6b
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-arcade/orthorobot/orthorobot-0.ebuild b/games-arcade/orthorobot/orthorobot-0.ebuild
index 193b753c5c02..2a7389e1d90f 100644
--- a/games-arcade/orthorobot/orthorobot-0.ebuild
+++ b/games-arcade/orthorobot/orthorobot-0.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit eutils games
 
-DESCRIPTION="Nice perspective based puzzle game, where you flatten the view to move across gaps"
+DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps"
 HOMEPAGE="http://stabyourself.net/orthorobot/"
 SRC_URI="http://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
 
diff --git a/games-arcade/pacmanarena/Manifest b/games-arcade/pacmanarena/Manifest
index 9e02a2c5fd34..9bbc3d60afcc 100644
--- a/games-arcade/pacmanarena/Manifest
+++ b/games-arcade/pacmanarena/Manifest
@@ -1,5 +1,5 @@
 AUX pacmanarena-0.15-underlink.patch 313 BLAKE2B 9fcee3997ae33960e0a663187fdfca9c99004b5e45f6dab3e07bb1469c088566bc30b1306cc49ffd1540d7378d76b57ae2b2af786587a9056f1531b39047fd16 SHA512 f51ede00af3864af5414ae9214928ab8128a662a1fdbc1f2f28a4ef64a4f57be8ccc843991f18cc8882fa99281b85850f5ed642ae0f1182c14b988b99a6a0a83
 DIST pacman-arena-0.15.tar.bz2 100112 SHA256 3f151518f3d4a9595ea03f9ef681e8a8829e88e76fb5d39bab0249906121fc23 SHA512 40e8092cf223d075dbb5654766f095ce57d61ff329aee5dc0f3c95655e3894ac507d8b48014326b7fd9265c81b9340624aaa349641efbdcde55bda0b1098f398 WHIRLPOOL 0fa5baa937ad0a4c3e7a61547e9ebe918d5c3f31bb78c32262a0f26bc8d3ce5a123e4850578d1b40fe4c66efdcceec14b7ce3d91800ddfe0e7f14c2bae6f0ef9
 DIST pacman-data-0.0.zip 11994364 SHA256 7949f080ca0ba4c02d737c5bb365856c3e66f103838329be8c1857d6c297b9b8 SHA512 f3619ab876ff9c0f354fff9e9b0acefaa1a1a094e8ef215fe1b57f617f79540ae87681dae0ec3c1df672615064be345f74e52a6f2f241bfe70d78f5b8c7fadc7 WHIRLPOOL 8e8b71f27a6cd8d1a6cb1bc76d95be12c574afda1016f746b88dfe217606202fad737fe86827ba577984845f1fcf2e39eb63126b415b0834e64a3a82038d5a07
-EBUILD pacmanarena-0.15.ebuild 1198 BLAKE2B 5a6894fcbfb043cd151a40d20e4a2f41fd6258b48758108b4bb481bee026fb91ee484289ce1787e2ba2ae63874478c4d4f939656e7028fe73643f0c1aae058f6 SHA512 040e1eb9180449311b7884dd37c5191627ef2834ef13dc6f5077bec479bd955f2806501166821ccc7c9cef10b2c44c39e6705de1c6ef4aa36b0dac227fb769d7
+EBUILD pacmanarena-0.15.ebuild 1188 BLAKE2B 3387c305941ceee6a23387d2048b262ec713f49fc7668480f211909a56ca1a3481b9be4d43be6c88ec83c9de948b08f1975d10395e20be1511b6bbe4f38bc1e0 SHA512 330df94d073970356595e78255da6f129654d872fbe0c77931415e607c0fe4e07762fff09273259a2986bc632c673d8d2ea330e9c7638ed85e994cd650abe123
 MISC metadata.xml 334 BLAKE2B 034963dd5af81911ac555bc717bbedf63c92413161b71d0771774ee6ad88317aaccfdee893c17a8a630a14aad726fc7dc9acbb19383b21468dd29f3b768e6780 SHA512 0ac8a4136638b425aa6122eaedb145adde764ecbe83e0388800c1f690abb27be59dd9b49933849e56111df0fc9741d71d8fe580f923bc6bf504ea8c66bd523c9
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
index 92044a7d9a58..1d57629a1ffd 100644
--- a/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
+++ b/games-arcade/pacmanarena/pacmanarena-0.15.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils autotools games
 
-DESCRIPTION="a Pacman clone in full 3D with a few surprises. Rockets, bombs and explosions abound"
+DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and explosions abound"
 HOMEPAGE="http://pacmanarena.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2
 	mirror://sourceforge/${PN}/pacman-data-0.0.zip"
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 44b844ddc7f7..c82f3f19e5a4 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/capicity/Manifest b/games-board/capicity/Manifest
index 7f0674b01f6a..6a3c916ff1d1 100644
--- a/games-board/capicity/Manifest
+++ b/games-board/capicity/Manifest
@@ -1,5 +1,5 @@
 DIST CapiCity_1.0.tar.gz 363899 SHA256 b4efa91aa7476dd9769cea151239bfcd9afa35cb28afd574d9bb7fdfaba1a33b SHA512 0d2b03bb806e13dabe8fad8dc8c00ce43944229e79f2ad573bd3d4e384e472937818558ddc2ff9e5d45c88bf66d2300d447265c0d4045255ca626dbc26dcc0cc WHIRLPOOL 3ab82f69c60e608f6bb33c97c475c7d42aa424801f5d3860f11b7f0b61943da94dff4ae0a0ca6345f5d34cbb210163de9f2fbc2a182a64906aabfff1386573c9
 DIST Capid_1.0.tar.gz 95151 SHA256 b4fd6808dbe1a7968c5996abb722aff53c98531e53afad4f424221c88ce18c4a SHA512 9bb9bf3e8dc17689cf404dae414759821317b100e553f074fc1a66921fa59161df48839f3f26c040c3045621ff4ab62af3b9919509cef0d9f21bf8a03003166a WHIRLPOOL 4ff278a8c84d23dd2db37de4d1f044588f006fd5701cbe23a5d4c68033df7260aa263745c1731137910fe63d8ae443738aff643efae094896ecaa0658def7b90
-EBUILD capicity-1.0-r1.ebuild 1303 BLAKE2B dd7e1e58570cfd2b2bd3367e5957fc4bfc49c284536b2d471e1b9e843fe7a2f415bf20656f9ae7d694e6c08bf39f6cfa4a8c49e12f49d5e2f0bcf248fbea77d5 SHA512 45aa192da26319e46455715ba11c635788fc913473bd39aded9c02080d9e8e6adb04982164abefd13b0368cb88366f20cfd5fa47d78925acaba029097c80bdd1
-EBUILD capicity-1.0.ebuild 1373 BLAKE2B 1d180086820b849a02afaa58a735ab439e9e330f8fbebab86a4f4ad9d68e4f25ea3a40bba5cb328ad7ef714d7a3840669adcc81e679f12e081d146df0cfa07a7 SHA512 9a6add04a91b039b9b9e923339674abf338b1edb78c57e10934c382c6282755a031ab6c5434d60e1955669270abfcceae23fa9de3331ae6f4ac90e5f37cab299
+EBUILD capicity-1.0-r1.ebuild 1296 BLAKE2B 731e88fea5ef51add7098b68c708e79b81359b4cb677c4b214f96d29ff76590a2251c7bd951408b039d4a4a3c5e07dc24addec183c7b5ea95b0bdb31460032d2 SHA512 47832a829370fb829a3dbff2e2701a2d57813b7d1138f669fc0a77c18aff29291f2ce3f49d1e05e749607915753a37121528ce9836f9d3f425c45579a6c43ed0
+EBUILD capicity-1.0.ebuild 1366 BLAKE2B 078dbafc7239a278853d8d0e3eb87ee00f6fa1401a9e89662dc23af5c6bf7d1f12406567e77c315dddcf5536d3ff02dba71a06ad50bb8451c0a63c8defe95e80 SHA512 93e4a5fc0aa631d9af34de523f0ab1e28a296deb2565d2c9571108870076f0aa579100b08ebf88c9b5b083cda1b5b808378a61daa838cadb9a9e1328dde5cd22
 MISC metadata.xml 333 BLAKE2B e08d45bfb7e2ce28435ec06f2e685adcf4c08daee07ba779a9133530856ce6cba42c2c531aa4b35d468e01b7ebfef89c8afb2950e01e02d65c3af8f32973f822 SHA512 c96593a634d3254339541e49b172195e94cbc00b0b0025f205479cd2b112353bdccfbd4c9d61a22aae831831d554e354c6f6158edb98ea1469e45c2430d684ce
diff --git a/games-board/capicity/capicity-1.0-r1.ebuild b/games-board/capicity/capicity-1.0-r1.ebuild
index 6336bceca6f5..114de8e7f541 100644
--- a/games-board/capicity/capicity-1.0-r1.ebuild
+++ b/games-board/capicity/capicity-1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils gnome2-utils qmake-utils
 
-DESCRIPTION="A monopd compatible boardgame to play Monopoly-like games (previously named capitalism)"
+DESCRIPTION="Monopd compatible boardgame for Monopoly-like games, previously named capitalism"
 HOMEPAGE="http://linux-ecke.de/CapiCity/"
 SRC_URI="dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz )
 	!dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/CapiCity_${PV}.tar.gz )"
diff --git a/games-board/capicity/capicity-1.0.ebuild b/games-board/capicity/capicity-1.0.ebuild
index 7c882f99db7f..6ce5f5881816 100644
--- a/games-board/capicity/capicity-1.0.ebuild
+++ b/games-board/capicity/capicity-1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils gnome2-utils qmake-utils games
 
-DESCRIPTION="A monopd compatible boardgame to play Monopoly-like games (previously named capitalism)"
+DESCRIPTION="Monopd compatible boardgame for Monopoly-like games, previously named capitalism"
 HOMEPAGE="http://linux-ecke.de/CapiCity/"
 SRC_URI="dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz )
 	!dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/${PV}/CapiCity_${PV}.tar.gz )"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 10b69c07d0b1..de5c6c4fcd40 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/caps/Manifest b/games-emulation/caps/Manifest
index 59b8b16de213..921017fed76d 100644
--- a/games-emulation/caps/Manifest
+++ b/games-emulation/caps/Manifest
@@ -2,5 +2,5 @@ DIST config_uae_ocs13_512c-512s.zip 1613 SHA256 972e43dea9b4a14f60fb97eebca9711e
 DIST ipfdevlib_linux-20060612.tgz 60265 SHA256 29b436da18b42e23362bb346a2b870ae6ff3c0bd1fa7875610c12484bfe7af83 SHA512 6d01b35850af9f5f4a45f8ee7f9c9b7a02ffaf3830588c46cf718c5007316baac49c1c7c928f0fc78e9014e3f094cb6a2d6e842c1440a7b8e34e6c31899699d7 WHIRLPOOL 0b9f5f98fdeeef35954645bb58a3978833682bdd1d4982e6cce5aa658d2e6d9d0bc2fd8c5677f719720f4521414e9a9b4d0998a690aa7b1e37aed5b39049ffa9
 DIST ipfdoc102a.zip 264258 SHA256 7d434bb032b054eaaf256cb4fe1ff82038d839c566918860a2bdc3a2493692d3 SHA512 f4b34349c65a5cffc6fad8370959ea0c2516087f46cbb43770b45cf14c573062e03abd77350cf4c8f690dc6a1d461dd0613a03ab70c1f8a72a3a43b9085730f0 WHIRLPOOL 8b99770f712b560dfd37cbc22acf94e97130779bd2b68c6017f369ed98f2038d87e23ec0aa57ef17f7c918c1602a63cdb2912a07d4338d53ee04a606fb6c38e9
 DIST ipflib_linux-amd64-20071115.tgz 24278 SHA256 0cb6af9038faf91d7b3d8bc628ce2a3b4348eaefc5c24a48447e37d287ffe297 SHA512 f306503a0aed7fd781bb6aea22a94fe72a5de952e3e26bb923d551ec5f165aa3fced4014df6a50f20b0f4526710b7e8643aa47a4de85f09bb2f3fe040d0b0f70 WHIRLPOOL ec5c747f2c87267845eebfd945d9c12cad244f7bcd3f5ed80601fc5c97e6b21257fdb917281099415e414467a4a1a79ec5b56dcc41642be74efc269fe7f3e413
-EBUILD caps-20071115.ebuild 1576 BLAKE2B c6207c739cf260e6f717f46a6f2a4fa0a6f2beaefbb55b07e097e1460bec92f2cb749b9aabddd5dbc046b9982855c63a77c368059ee58ba69bcc409ae2a20c9b SHA512 d69b1f358b15bcfc7d8597deff21c084214be170ff9e366602fcb053b5c1999383e5bc63b81cf65f338666b1a920c9529486bd5caa256ce228bf515b606be706
+EBUILD caps-20071115.ebuild 1548 BLAKE2B 410627ac26df710dcfb9279ada9f1a4d96f1d75988dc77dbd3ae441fea1a0aa84b4df9be3002fd44d327bd165a26e22d2112e47e0f05b8edde4bdfd71ece70ef SHA512 4b0cb66de587ed30daab8b203fbb3a086995786ceffb6d1e678b0308518b2ea4fd67b18ec5dfd9e9eb31b59dc106a44d70ffe1cbfe9a8d86fbcc04aecc48171f
 MISC metadata.xml 603 BLAKE2B 3a37c2c85d43ee38463f362f4ca6e85d0368ea684f3e63adb4438d08bd42b5562cb2a79067774f45ca773254c07bcc31b24e6a45d927ca54ab19c2dff6eb9fd5 SHA512 fedf1973e487ee47ad0ee6552e3867b2b9732084dae90cec32168bfea54dd8d6b25fedf3c7336205706a14b72a7c14cb4653a4b18293f7eb6661c3edb781e3b5
diff --git a/games-emulation/caps/caps-20071115.ebuild b/games-emulation/caps/caps-20071115.ebuild
index 287a1bf2a02a..e466d2a9e18c 100644
--- a/games-emulation/caps/caps-20071115.ebuild
+++ b/games-emulation/caps/caps-20071115.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib
 
-DESCRIPTION="Support library that allows third party applications access and use C.A.P.S. images"
+DESCRIPTION="Support library for accessing and using C.A.P.S. images"
 HOMEPAGE="http://www.softpres.org/"
 SRC_URI="mirror://gentoo/ipfdevlib_linux-20060612.tgz
 	amd64? ( mirror://gentoo/ipflib_linux-amd64-${PV}.tgz )
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
index 015bbf83c91e..25b878a73d79 100644
--- a/games-emulation/emutos/Manifest
+++ b/games-emulation/emutos/Manifest
@@ -3,6 +3,6 @@ DIST emutos-256k-0.9.4.zip 1600186 SHA256 c788da706e82a5514f6d2faf11043a8998adca
 DIST emutos-512k-0.9.3.zip 289576 SHA256 2220abe4b75e6f0709327446a5ac553d8365e2e22cc0c57d755085f272fbf5f0 SHA512 5f99f817813e90b65c19753b2cc68a1f1c8652e9a9dbe0d6241503bae2d196c04ef775a68c728e654860772cac8258ae839fa0204657d56d55a112d2a91386de WHIRLPOOL 2a32f2d968a166da64d57518e40cfb228b357a16e9d0ca44750c9e6043de828dd2721e4aec2338d3c1fa19928c56a9730c9aaf29a55d5c060bb8f0b7ee3b54c6
 DIST emutos-512k-0.9.4.zip 314877 SHA256 a8445ce74bf642fecf237953a20641a2e97b74feaadc7fb7149e8221634f4218 SHA512 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8 WHIRLPOOL c5cb35824b4cf5ffa19c27295c9566cfaac65810dcce6791405198b61fb703ed49c6986dbd63eb79a0dfcc8b4b4cb6be64cbd79076d9a2bd1c60a3d469d98add
 DIST emutos-src-0.9.3.tar.gz 935570 SHA256 a22098e732e59d979a34c1131a87bca9701bd26a616df20329286cdcb9c9ed8c SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824 WHIRLPOOL 07e2d054c4dd395594e264ebccecacb44479e9981b3f162025b2ebfaa9b5c0c83475bd751c4423f6a7d60bc6701d8205a7898a40f7b8f09dbba0ee0b6c889d05
-EBUILD emutos-0.9.3.ebuild 674 BLAKE2B b8f4bec529ba2829ca3e3a99d31afd43775555075eabd01ef209d3809d83bef90194de025a56718c83999b9889e5b3f0c6c4e4616a670a066418f6db75162616 SHA512 fed0c89196bc6b2723c11facbe43e1c66d403cd5b1509bbf5144b293e41b0cef0f852631e0b3c8f8f9126e13bceeb5bb8c066e5dcafcdcd876a01046cd443945
-EBUILD emutos-0.9.4.ebuild 674 BLAKE2B b8f4bec529ba2829ca3e3a99d31afd43775555075eabd01ef209d3809d83bef90194de025a56718c83999b9889e5b3f0c6c4e4616a670a066418f6db75162616 SHA512 fed0c89196bc6b2723c11facbe43e1c66d403cd5b1509bbf5144b293e41b0cef0f852631e0b3c8f8f9126e13bceeb5bb8c066e5dcafcdcd876a01046cd443945
+EBUILD emutos-0.9.3.ebuild 672 BLAKE2B c3fa92b20314bdde05fb39b5aa1b7364c743d78e7b86d70d8507fe5acb1b832bcc05c1037d8b0541ce85f4247bfab4b2e152d808b9de7a710060696d3a058b60 SHA512 e288343d3c1369a1bfc25a43d975706f06f735065e0c4704e3c3ecbfb3862ed5093aea9027f40947ea704153e95698faeff00dab78b7e6509dfc9607a3296868
+EBUILD emutos-0.9.4.ebuild 672 BLAKE2B c3fa92b20314bdde05fb39b5aa1b7364c743d78e7b86d70d8507fe5acb1b832bcc05c1037d8b0541ce85f4247bfab4b2e152d808b9de7a710060696d3a058b60 SHA512 e288343d3c1369a1bfc25a43d975706f06f735065e0c4704e3c3ecbfb3862ed5093aea9027f40947ea704153e95698faeff00dab78b7e6509dfc9607a3296868
 MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.3.ebuild b/games-emulation/emutos/emutos-0.9.3.ebuild
index 5df0220e5081..5a1df88c2436 100644
--- a/games-emulation/emutos/emutos-0.9.3.ebuild
+++ b/games-emulation/emutos/emutos-0.9.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit games
 
-DESCRIPTION="a single-user single-tasking operating system for 32 bit Atari computer emulators"
+DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
 HOMEPAGE="http://emutos.sourceforge.net"
 SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
 	mirror://sourceforge/emutos/emutos-512k-${PV}.zip
diff --git a/games-emulation/emutos/emutos-0.9.4.ebuild b/games-emulation/emutos/emutos-0.9.4.ebuild
index 5df0220e5081..5a1df88c2436 100644
--- a/games-emulation/emutos/emutos-0.9.4.ebuild
+++ b/games-emulation/emutos/emutos-0.9.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit games
 
-DESCRIPTION="a single-user single-tasking operating system for 32 bit Atari computer emulators"
+DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
 HOMEPAGE="http://emutos.sourceforge.net"
 SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
 	mirror://sourceforge/emutos/emutos-512k-${PV}.zip
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
index 95cbe2733d4b..13fcbc997f54 100644
--- a/games-emulation/fbzx/Manifest
+++ b/games-emulation/fbzx/Manifest
@@ -3,6 +3,6 @@ AUX fbzx-2.10.0-keyboard.patch 284 BLAKE2B 15d4e7feeb9a9e466fead61f4ff399bc4f02b
 AUX fbzx-3.0.0-gentoo.patch 6372 BLAKE2B 0e218a83a4eee9f7fbb632f74eb64358149715835f566c4256cecfa5857c615d732073a1346b0e8f4998fb5c560d7c2d39a083e5c1ae99cf4c889b6de42b8cde SHA512 4de9830dcfe015833939c1795f016d37afa0d364b94de2cc64b941f8d4df2acbe7220be951fa403bab6eba0db4882a8c15c376eac108fe6331e67708515b876e
 DIST fbzx-2.10.0.tar.bz2 326352 SHA256 deed3d37247e4154bb10325d014461c8caf0c55ca23a611c62035e491a4f960f SHA512 b96ae4029e4ef73d15c851a54c8e057131ba6e0acf03820222aa4d4bc91e8ad497556cce41c5faef230939f1c88423e09e435f9ce91c0e0f183f6eac7843bb36 WHIRLPOOL 97bb0fcbb9d1c5921b7c6f9d4873fd620d2219b71abbaece2453f4417bace91c1b1fab44382f2d63b5aa8c3225f5f865150b51ce534a228712a39543912ea908
 DIST fbzx-3.0.0.tar.gz 435239 SHA256 8c739edd3de599943daea0078220b5c7774fc04b62a24a7a33854e5ee24056f3 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083 WHIRLPOOL d56d7c54458f75de135b4e675bc7980ca72bebebbd0461c52db5d9be34faae1000c9d7e52dea6a5a199133edb2a5b9974979ee27dc30d811235c90fca83c908f
-EBUILD fbzx-2.10.0.ebuild 918 BLAKE2B b417acbeddfad1192caaf4e6968484b6f8637252a3d63877241de01595e09a24c53b341c2e874fb713924bb32df3043d07340ae7ce13f56388b92cda23b75229 SHA512 c374c897bd7d6b03863d9781af9e4f9fc98b846af080c2cb1d404c8dd68c10b32327428027cd5878c4feb34bf4463b3c73e7df16e4cf9ac284bda040453be52b
-EBUILD fbzx-3.0.0.ebuild 921 BLAKE2B 9eb74b130d000411169319b941d8e9e4238bc973e15dd70bcf34b5623646ea15b4647ec51a7824b8011c8830c7db261de433ca1e5c3702b53562753d02b65c3e SHA512 7b4d18f73d46df2c9c5c1b134ad908eed965c8209c051f60b9a14c50c8fe490d70948b3c37761817306f2be4192e59e1db146b136a8e5daf4275c9208dc7a614
+EBUILD fbzx-2.10.0.ebuild 873 BLAKE2B fd4651f91d0b2aa7d9036cf8ccbf9f0ea8059dd36246a5b38512ee65871ae07a7af7b2eeda84fb4c560a9f03ec185c024d5f2d9adcd6d8c1ce37c89281184e1e SHA512 304b95db1228ad688452f23219f95d24edbbd194a6a87858ba0b2c23bd108e89722c2fecd19cc6e381e384e4b0c4b24e2bd1034c48704de76a7f85104ec7cb15
+EBUILD fbzx-3.0.0.ebuild 876 BLAKE2B fb8d08243736ab6c6892aee2cd2362bda182c1d25a121141ec3c38831bde3c9bd71e5af1bbf912b97b9ad9e9edf7335313063ef566b3f6478cf52e93553c4923 SHA512 1b4f83367ee7fa3db37102c2e9ebb0f4552354eec9fa527d3eb4e33e617a76faae82436d6bb638d21d66cbb2a57b9639079406e9df412c71fb65e3e6f131687e
 MISC metadata.xml 469 BLAKE2B 9c35e70c04d622fbda873c4f3d225b5a7813627bfc6bb01e14ebf011869385d9449652d056e3f2a4ff175337b55e63f987234fa2b3b600576611ec42f01187ca SHA512 72d484a764834cd1691665dea6904f154af7a4a6f4c8dc43eaeafe71ec775c8bf0b62ffe42d3cf244829292ff4d0f8a677eccce1902110b94e6f1fdd31219a25
diff --git a/games-emulation/fbzx/fbzx-2.10.0.ebuild b/games-emulation/fbzx/fbzx-2.10.0.ebuild
index eb9cce0a10f4..d71e87f831a3 100644
--- a/games-emulation/fbzx/fbzx-2.10.0.ebuild
+++ b/games-emulation/fbzx/fbzx-2.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer"
+DESCRIPTION="Full Screen Sinclair Spectrum emulator"
 HOMEPAGE="http://www.rastersoft.com/fbzx.html"
 SRC_URI="http://www.rastersoft.com/descargas/${P}.tar.bz2"
 
diff --git a/games-emulation/fbzx/fbzx-3.0.0.ebuild b/games-emulation/fbzx/fbzx-3.0.0.ebuild
index 2707058d60d2..e019ce4a1456 100644
--- a/games-emulation/fbzx/fbzx-3.0.0.ebuild
+++ b/games-emulation/fbzx/fbzx-3.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer"
+DESCRIPTION="Full Screen Sinclair Spectrum emulator"
 HOMEPAGE="https://github.com/rastersoft/fbzx"
 SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
 
diff --git a/games-emulation/zinc/Manifest b/games-emulation/zinc/Manifest
index 9158b4cd2b8e..926334de53ef 100644
--- a/games-emulation/zinc/Manifest
+++ b/games-emulation/zinc/Manifest
@@ -1,3 +1,3 @@
 DIST zinc11-lnx.tar.bz2 305824 SHA256 70a4b15130fe84cdcd166cd0964d11741513bef9236fde782bbe8edeff7e4776 SHA512 8511ebb867347adfc00448a74548b4a22a2d854a14c663a626d33738e89d2cabd3248837a26d5ed099ef4dc40a0f451df639663774926e797ddc846a7270af4b WHIRLPOOL 596f594365ea96a481be4db121f5dcce99107ee2cbffc3f338c7ed84e916c9a1b4fe665aad7972c17b3fc075f6419a4255ea66db61a54c5dc3bdb2fa82e74d6c
-EBUILD zinc-1.1.ebuild 795 BLAKE2B eed82b3f50b4389c1b089cbf8a9b0a78fa7348f030970b5b2059207ffc483e399a81465053a708f0c99f539ad89d7fc3ba5f6558e55af958a75581afd3bdcf42 SHA512 633b0ee95642e1dba853700728d6384446b263d2ea2c270af2fe132c0cef826564fb2713bbc29c2b702e4d9b31cc62e425764f9f6f03270c42e7b4e5b23ce132
+EBUILD zinc-1.1.ebuild 784 BLAKE2B 4d66df0549dd96c3cb0953a79fe6515890aa137ee006d2cadddf719504ef3109d515f7b7a81452e8ae580c395bc88ad185185573e2730d1440dd3e0b39178e62 SHA512 be4b89586cf84d47e405cb16826065eb8b568f9e0cd2cfdc8bcbf9e4a223cccd3ce31b26f532f874a559ccbe8fa376ea95e8c1376030bb94eb7458b788a3f50c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/zinc/zinc-1.1.ebuild b/games-emulation/zinc/zinc-1.1.ebuild
index c690819ab460..420a09388ff7 100644
--- a/games-emulation/zinc/zinc-1.1.ebuild
+++ b/games-emulation/zinc/zinc-1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit games
 
-DESCRIPTION="An x86 binary-only emulator for the Sony ZN-1, ZN-2, and Namco System 11 arcade systems"
+DESCRIPTION="An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades"
 HOMEPAGE="http://caesar.logiqx.com/php/emulator.php?id=zinc_linux"
 SRC_URI="http://caesar.logiqx.com/zips/emus/linux/zinc_linux/${P//[-.]/}-lnx.tar.bz2"
 
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index b54ae5ee2b91..a6d8391beefa 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
index 170b4bc50546..023391861010 100644
--- a/games-engines/frobtads/Manifest
+++ b/games-engines/frobtads/Manifest
@@ -1,6 +1,6 @@
 DIST frobtads-1.2.2.tar.gz 5213193 SHA256 f2802f6b8b2fb1e2a2c46cdec92b32e7135b6aceb3054a588eb9ebb9434a186e SHA512 14c0c8a624632b00a7615e643f592eac2d6a0a523f9e019527e9ae8f04402cc4ee1568417bacbfdfd31df6452536a65e012ba0f0d3cced8ba6901988e7a5bc42 WHIRLPOOL ffdd10df65bdd11512c115d8ef0a9a990fa31220628b437eb351eddd2a260fd51d838096cd9860c737861f941e18c148b85a15388c2544e047f6f2ef589ae9b3
 DIST frobtads-1.2.3.tar.gz 5227704 SHA256 88c6a987813d4be1420a1c697e99ecef4fa9dd9bc922be4acf5a3054967ee788 SHA512 4efb888860edda24bb5a5812967d0b863614558e9839cf0cfabc649ab0175719bf663de5e725034ba160c015d269dbe2df046cf47ad1019e668bf5b1fb564d7d WHIRLPOOL 47f23a3d8adbaea2c450c794923a23c516db7aecc1334aa2907dca77c2dabfd3a9707a9b7a3c1bd06cac3df648a33a9543ad1f3401eeb45d765ac845a76884bb
-EBUILD frobtads-1.2.2.ebuild 1083 BLAKE2B cd1d72e303aa7fb21509b06df7bf1c2680e813de4a26d096ba47987e4288c43e9d21b69fac317a5c0ec64a10f8bb5a525d911b8280a89676161e0cf9df1652ad SHA512 e8e99ff22ebf4602d36082c88f5b56ff3c2550246e65ef535064eeac54b5a95a002c9e18cdf73a6776129ec28c54ffdd298edc92a304da0d0e8fc8eab42c4614
-EBUILD frobtads-1.2.3-r1.ebuild 1092 BLAKE2B 10aa28e7f77052b90824e8ae790e7fbed5f92dc554ba0cd3641648aa4559786228485ce7bd0ee5a81f7c1d1bb2a9980c8829ef4c233df9d18f80d29c03be1dbb SHA512 51c18855aadd6577a9b792e407e675b572c5b09fce42aca9b608a03bf42173b48b96184e623175bde857d51068e9c288eaf40dcd98cecb41cf93c71d81526264
-EBUILD frobtads-1.2.3.ebuild 1118 BLAKE2B d92438b09ffb93577bd815c2d1da0e43317cbce3f3234a9a73fe854ba85736c131ba5073d187964c8d5b9f51dc97d4f55347b1ffba380fbfe83c995ec06474ed SHA512 d460b03936976d56f2b742b86c385a5d38efca3fbe8d741c642514a5dfe151d2feb3d21d985deee058c9085705677223cfdb9c31108522dce3de9e8e30b4ad4d
+EBUILD frobtads-1.2.2.ebuild 1075 BLAKE2B 701433085757fb132805096e97cddae4b28d0679e714dbb3d0fd328c580bf98e369948ab319814be9e5d8d5232c455375e573a08b6f9ed349e28f625e091bbc3 SHA512 b955862c5ef484da86489def3b3189664add10cd13a853f1c7da82879896502672ea3a01f90e956c363220366ceaff29ec6402a2477d5220f46b3f69d33b56bb
+EBUILD frobtads-1.2.3-r1.ebuild 1084 BLAKE2B 3b4ac366d3b1730473a251261f0c08f24ae8b5c3a9e70fe9f359574a409c2f8f4b62806c92f48ae26c2e5998933a64c098940c33050961ce93becc5c48495c18 SHA512 8f7b51246acedd865d9a396819545964fbcfc69f61c8381b0da2387fb8695fe9655d07097d448a74a8a3606ff3b9f32c738f829e9942ee8bdfc8b332f435c909
+EBUILD frobtads-1.2.3.ebuild 1110 BLAKE2B 6ae93301dbe0a99ad882bcdd53fc67c7c1c0e9cc5ae4218dc033611a45956f97205d9044e1df06668da66350e1a65bb44b01c8e3f09de6e2e571bf7790be1116 SHA512 095bd6241dd7cd7019f8249a8d68914a086bd1963fc7b0fafb0bc586e61cbe5bb9a6ae6cc39ced4e53049acaa6a3ff11777f78cca4b88d9ba867de95e4698719
 MISC metadata.xml 394 BLAKE2B db39dd99a448935896847c3ce0c824a3043d65d82e7d35cad3afab2538aebffca96c532f83182bf2e28fab22fcb0d6145e6e5a383def6d956db6d0558e73f481 SHA512 591c0df18a2e4e1469e1f95dce9c74f3b66261377b88ec9dde79c56094253a5579427a2fa836fb1c2926344b95a471b7d13bda4a53f4c6a064b06c61d89e1ab3
diff --git a/games-engines/frobtads/frobtads-1.2.2.ebuild b/games-engines/frobtads/frobtads-1.2.2.ebuild
index f9c7a71ece4e..4238931dfa79 100644
--- a/games-engines/frobtads/frobtads-1.2.2.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic games
 
-DESCRIPTION="Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures"
+DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
 HOMEPAGE="http://www.tads.org/frobtads.htm"
 SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
 
diff --git a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild b/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
index e52f20f44bb3..7b35a8571c33 100644
--- a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils flag-o-matic
 
-DESCRIPTION="Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures"
+DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
 HOMEPAGE="http://www.tads.org/frobtads.htm"
 SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
 
diff --git a/games-engines/frobtads/frobtads-1.2.3.ebuild b/games-engines/frobtads/frobtads-1.2.3.ebuild
index 48b95cdf23d0..eb4fea8eaf09 100644
--- a/games-engines/frobtads/frobtads-1.2.3.ebuild
+++ b/games-engines/frobtads/frobtads-1.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic games
 
-DESCRIPTION="Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures"
+DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
 HOMEPAGE="http://www.tads.org/frobtads.htm"
 SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
 
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 90038f28bbc1..449f0a8add56 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doom3-lms/Manifest b/games-fps/doom3-lms/Manifest
index 934aedadb252..b514669346a2 100644
--- a/games-fps/doom3-lms/Manifest
+++ b/games-fps/doom3-lms/Manifest
@@ -1,3 +1,3 @@
 DIST LastManStandingCoop4Multiplatform.zip 309768743 SHA256 3e88196efc60a9046b9518a249c99021aca1c6341c654129a772b1f28f04c37e SHA512 f3d6fb1beab25dafc51a59153edb4cbb173ea4cdfd924b8f9610873bc1326efc2d85d62a23c6523b4a61319718a35ed44fecdf59bc8346fb1abb159ac93e6b15 WHIRLPOOL f9a2f06ac687df06782b0bb8ec54f2042ed5fc5051a2fa4fa893b57ba221c05b5f95f99eaad9bdcc0efca71b6ec38ba7c8d9919fd0cd3c207be55f29e85d7625
-EBUILD doom3-lms-4.ebuild 670 BLAKE2B 33cadb3ae1c705c1746be38c0b2942733cd383b7c16ddb56007d766c78330e95dcf35ca8005b69b91b8abbd604b07e2f1b9a757af1d9cf6af3883722c9eed6ef SHA512 a241854f4cb5d0453620bf1ab26cdc1dcb0f2f1d832e84e57fc26cd1221322540587b27d4b7ebd37f0333a18dfb775ece489388fc371ec84125d1e528896ac17
+EBUILD doom3-lms-4.ebuild 666 BLAKE2B 10de38d15568e16f8e621a3f102b748f04b823be8644f36198b788d867f0b84153d192c056aace995b28e1f4376f73684f17764e00fea2de569e44e8e0276067 SHA512 087d3bb0fb7d72636da054a90b8009bfce59dbb07c21f3aee50b58e123242ee174f7ff3ae69b4952599a0c3f3f670e1261b61086f0b977df449b16be2aa0512f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-lms/doom3-lms-4.ebuild b/games-fps/doom3-lms/doom3-lms-4.ebuild
index 1abc7dc0026b..46a2c918cb3c 100644
--- a/games-fps/doom3-lms/doom3-lms-4.ebuild
+++ b/games-fps/doom3-lms/doom3-lms-4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-MOD_DESC="add co-op support and/or play against swarms of monsters"
+MOD_DESC="add co-op support or play against swarms of monsters"
 MOD_NAME="Last Man Standing"
 MOD_DIR="lms4"
 
diff --git a/games-fps/glxquake-bin/Manifest b/games-fps/glxquake-bin/Manifest
index 3c9844abf04b..0b2351a53147 100644
--- a/games-fps/glxquake-bin/Manifest
+++ b/games-fps/glxquake-bin/Manifest
@@ -1,3 +1,3 @@
 DIST glxquake.tar.gz 164094 SHA256 975d8a59fa280dab7528d5afe3cdab217e0c09423f407dbe609478efb871f9d5 SHA512 0adb92dbdc8b3130bef7e46ad95a7efa6ddb3723e3e8891cacc3c2e46bccacb6235f688e12b8a1f35099615b6683b1409b2e380fd4278e0827897b2e0c8f3090 WHIRLPOOL 8c78befb5d03ce3c180dc4c9031c69be23c0f87c566a35892683454c101c4631feb74fc63538c16b4eba027fbe26dbbd89e5f13dbbb9a86fd597c9daac6bd1b8
-EBUILD glxquake-bin-0-r2.ebuild 1156 BLAKE2B 4b085725ad46ccd667a286c709af00529c37e93e64d40994b55a8ac8e091c8c3c723d1a6830106ac7983b97d6f5295f8431457b0832b41e438ca0af6fa04f9ba SHA512 038f27822d1690a4ea98075a06f7d2914d60767ee501caf5526f1909d2917afb4cd415d8b7a1301d0da13623ee56a48c6403541e5c11737af0ce6b39a484821c
+EBUILD glxquake-bin-0-r2.ebuild 1154 BLAKE2B 42b2b9b445e61a06a6ed029876952f38bde7db67e1240e596a9e3719891ebe6a8493318de2e2a8d41159f6d684916e20f81399d10e526626ca7a6762c3869d55 SHA512 fcd428a392de67eadf279d2a2f5de1b81152d5c0a0c10e8eb8c58432a5ba97f8d7439cb44d0d15ef4752a5e7307f4690ec8fc25d34fee3bc0c2af8543102d382
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
index 16ffdde57574..14f81de25338 100644
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit games
 
-DESCRIPTION="a binary that works with every 3D-graphics-card that supports the glx X-extension"
+DESCRIPTION="A binary that works with any 3D-graphics-card that supports the glx X-extension"
 HOMEPAGE="http://mfcn.ilo.de/glxquake/"
 SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz"
 
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
index 0cb6585efbe2..bb125b38f322 100644
--- a/games-fps/sauerbraten/Manifest
+++ b/games-fps/sauerbraten/Manifest
@@ -3,5 +3,5 @@ AUX sauerbraten-2013.02.03-system-enet.patch 1880 BLAKE2B 57c35e0d15344fdb226f82
 AUX sauerbraten.conf 605 BLAKE2B 454045423be96b14debca64e6f65fc3c335f3428affae889727f9bd598b7d3c4084f2d50b48a26f8571f8774f79a99705479ed73b68058c527f7d44bf5ad8a18 SHA512 685b7358ad7267b1b19ac00f879a82205f346b32fda8cb460c4f8c50e9f20263c102b0fca62ab437dabe67ebbdd281f130f28f3b8ef2bcf064ae45fbd23cce67
 AUX sauerbraten.init 1951 BLAKE2B 48402bfcc32caf16491886c6ccb7395628b2c067a5126d59908fe676311bfc781b9aec89aceda8920cedbd3c2c5477e9b404c29a0f6f7c64fd29263432076d1c SHA512 9a96557cb2822f30693900b1dc9ecad9f1eab9e8a3d75432667bfba784ee86754649cf08ccab5f9cbff6be7ab584f3325b9c40c947005cdee425716a888d5c40
 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897 WHIRLPOOL 47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e
-EBUILD sauerbraten-2013.02.03.ebuild 3218 BLAKE2B 73a7c7d493606ba938bec08d5d1fb2dcdc3870a28b7aee320d7dc36a40d3311c920eec1d27104394e294e43cb2cdbec0b1dae2e14222b05bb4ca8c1de8d51b26 SHA512 07327b2343018faae1ecb59643b71f993f89caf05185d7c25c426c329f2a8632efe1d2ab16697a291c2f96c98384507a198d2abc2200bdd7241d0eeacdd964e9
+EBUILD sauerbraten-2013.02.03.ebuild 3202 BLAKE2B 158a7d5d4a66582b57cbbbc0478154d5488e9f92d29e397093b1fc6ed17c20393014701335db7f9fed9b14d0cc4f4271625e673a63a4cb7ed6531d5b96d23e44 SHA512 f00b9644c6d3cc3867e315a37da362ee23af17ca0e499daffdc16b9aa9ce2a05bbcac77092c39e70567ea4a5a22faa62c25c6afb956e22f14fdbd6df46bda83e
 MISC metadata.xml 401 BLAKE2B 0447e0bdea4cbb8ea99d24ac4f854ff4aefd0e62c4fb1e349485a5ec8429239c95299f5f26736e5458525787d6ef54bda400441ac5b6de920a2ddf949d2cab20 SHA512 1087c8ed886c5066a8bd600cbc9878e6bf21c41f163939daf22c503ce1e9095aff13b8986959aadaaaaf04cd2f314bb664042829deb30196b88a8c2608ce8266
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index edfb69774e32..4bb7c3603b58 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic gnome2-utils games
 
 EDITION="collect_edition"
-DESCRIPTION="Cube 2: Sauerbraten is an open source game engine (Cube 2) with freeware game data (Sauerbraten)"
+DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/"
 SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
 
diff --git a/games-fps/ut2003-data/Manifest b/games-fps/ut2003-data/Manifest
index 9e9d0d78bb93..1cda69a25509 100644
--- a/games-fps/ut2003-data/Manifest
+++ b/games-fps/ut2003-data/Manifest
@@ -1,3 +1,3 @@
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
-EBUILD ut2003-data-2107.ebuild 4052 BLAKE2B 72f8f994ad418683c423237bdd521305af7ac1a1dd5e5aa0cdae1fef92bc3ba38dda92c073bdbac13463f66a0ac2bc4c59ee1494f6de0a2d5bd6dc5b90d6c42e SHA512 73f888fc9ab672688acc1c7f927166079db0e054a0ffc4764ed7074a918717dea2d93a375cbdf771bae6f3e57bacc84f3ad9d0df875a1985376f5896e1b85e16
+EBUILD ut2003-data-2107.ebuild 4035 BLAKE2B 74da1f7c3dd392d9d9c7bc4a7123cdb7a0aec4c36aaa9582146f5db4deb20171149475d4434193f089d1bc2888831d401a7749a3e5027f27a0f96a912918116e SHA512 7ccaba13a464a8f17242f564dbed14e6f2345275e8798e5e2779e4167bde30dec7d25df8df0aaf3e471504048aff3aec7f1a8cda3b9e8225c83d2160d6829c9a
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
index ccd587855cef..933dc8498d89 100644
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils unpacker cdrom games
 
-DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 Game of the Year multi-player first-person shooter"
+DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.unrealtournament2003.com/"
 SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
 
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index f090890541a6..4d27580d2302 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -5,5 +5,5 @@ AUX ut2003-demo 692 BLAKE2B c9eef6a5ee06c4c9619ca29c7cdafab5763a3cb63a8b060ac4c2
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
 DIST ut2003-demo-misc.tar.bz2 31851 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0 WHIRLPOOL 5597c0c4444de2e50cf87c23cbe4c863258da761645d41f4693a7aa774bb68cb8f8a4bf5c8b3b4e8a670f7c8ce616728d1223dd18b20c59fde60462e413db9f0
 DIST ut2003demo-lnx-2206.sh.bin 137253079 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173 SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be WHIRLPOOL b4bd520a60385d803d7d44247a48ca80a1116d9a3b9ea9f1dcdf2d1114bcc42e8705f00e228fe50fedc95d1d1c130ceaceb0c54210f51fb03da0672d13c35758
-EBUILD ut2003-demo-2206-r3.ebuild 3570 BLAKE2B 0823fad6821a6140d8338eaf0f4047fa3cef924fc610101c0ea5bbb86e96d0ea7c3e13529d28920b78b9321c037cff8dc2d69c60b79cf775fa9339cbbc320b50 SHA512 7e943f445417022ac7744333288cdf8a811dbeb7ec1567092ad4da9fd6c4a6573e9d111bdfe2e0760715afdc1e83d574a7349ebe46213849337efad38f646cbf
+EBUILD ut2003-demo-2206-r3.ebuild 3553 BLAKE2B f171933b013e60d8420f14a58ed6296e532ad076e3f43929e70a6e3be6282620161986f6a7eeec5cdd90d1d781993de70155d6d8db83c618c2478809809644b6 SHA512 c35fa9c2b8ff0f6b9a8c6e2ebf6e74402ab444f992cc60afe8b2769de094fc307330db721d9a6220a5928ce526046eb2c3caa8ab133600d180b4c5cdac05e244
 MISC metadata.xml 602 BLAKE2B 860e51d942ba4cb4200404571230e2f9b7962a050c57e3c7ae336fa909e183a248c191f4dd0718a564945f5cb02592d578f774e1c50db208639ac02470980799 SHA512 2c956bf66965f83b68bb0c04d79d479ae76af9b7781bca93a1ff7898f02838ee0c1cc72290943be9902dee38096f2b119f95f21e5bed781e8c04f331a60adac2
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 317f0d5235e7..2300c78fa96d 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils unpacker games
 
-DESCRIPTION="Demo for the sequel to the 1999 Game of the Year multi-player first-person shooter"
+DESCRIPTION="Demo for the sequel to the 1999 multi-player first-person shooter"
 HOMEPAGE="http://www.ut2003.com/"
 SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
 	http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index dce866d026c0..4d123b484cd0 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,3 +1,3 @@
 DIST cbp1.zip 144163647 SHA256 c952dbd5a0fbe986b77bd56a57218733ff26ce8f5d074feb557a69c44ec1e863 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd WHIRLPOOL 9ee46970dc69b32b77ccc8707d1b2879aaa49ee98edf5b64f26097353eaa878e49bd4daa54aafe8a89b6034e8a73e63d1508482d9dd9632295eb65acb0cd0d26
-EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 484 BLAKE2B c83f55a6f24d5d97dac0daf8810ca6b687bb146f51da37a984397500900720c9524c2b779c877907e0405091c250325e9fc3e38dcae6eb1cbf54ae037c4432e5 SHA512 a245474d745cb3bef421e8a06266598c3e493f294d41088f1c185e568f5edd69170709f8bc1a744e866a09e2500d6fb127cb766460faf6e5489ba63833e01cfe
+EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 472 BLAKE2B 5f266316989b450ac506c3701a2cf79a135b7312ab18d51be449f80a6e4e6072bb8c09cab751a89f6a7ce745edda8407564366ec7132c768368ebafd39e10634 SHA512 0e06854eb7a97e3aa5cede0c216501d9d20c70205da7e5304ccc42c6ac6964c4631aca577fee6b9091ea94a8c522b697d582f2c73a589c77138e9eeb3ca67589
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
index 2752d506b044..ff68154e339d 100644
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-MOD_DESC="UT2003 Community Bonus Pack repacked for UT2004"
-MOD_NAME="Community Bonus Pack Volume 1"
+MOD_DESC="UT2003 Community Bonus Pack for UT2004"
+MOD_NAME="Community Bonus Pack Vol 1"
 
 inherit games games-mods
 
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index c1d326401790..648382fd6b9f 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
 DIST cbp2-volume1_zip.zip 203766207 SHA256 94e21360d2f87489822468b6e037931ec0a2d9d3653259d90a58cabaacc3370d SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213 WHIRLPOOL 7214e089c76a19f14c88e763434e5505f6a71180a9293600f200e521daeb4a209c0fe032d2a2e616152e758bfb7223012c680873cb40a66c3528a2d0aa673ecf
 DIST cbp2-volume2_zip.zip 200444127 SHA256 62af666645205c256caf539646483fcaad24af91cb5cfb283fc9e6b48f18c79f SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4 WHIRLPOOL 878c75ab02c21042c3d76be46fae7caf01cd9f226703d0335fdf3f96e5c175e0904828a5d7a0a6f7418b3e03dfee6f964c40261b928d2ab1616d784831df2ce0
-EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 864 BLAKE2B e98ba8e3c0132c233a3ad44ceec94d5f7d08278b1675c720c3518b6be54c17d413242ffdfb782b3d4e33a9ae07800c69ea354ddc9e95a6ac7975c4314ba5c8a0 SHA512 653f305c8a8754815afab9834328847b7991fe414fdacc78075f93cf79f9ae8bfdc34c1c14083895bd1e9d0db0020a31e6478fc30f9e6dd0308db27bbaafea93
+EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 856 BLAKE2B c69029c2ea4edb1c8f8f656e589c60c15a641e36b99faf6b5cdad88897c1515b5faa0581e4cf0c94ede9c12ad409a0682dcdbe53dbeb912ca58b7a46253135f1 SHA512 f35be19938883818c31c46a343476efb8b9c67d958022d73280032744a50b41f56ae2faa99f78fc9d00ce428058a68cfb3ac069e520820be9ad6da51f7e6907d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
index c5fc28cbe82a..2d86cbab0490 100644
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=5
 
-MOD_DESC="Community Bonus Pack 2 volumes 1 and 2"
-MOD_NAME="Community Bonus Pack 2 volumes 1 and 2"
+MOD_DESC="Community Bonus Pack 2 Vol 1 and 2"
+MOD_NAME="Community Bonus Pack 2 Vol 1 and 2"
 
 inherit games games-mods
 
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index fa3203c5deda..856001ab2888 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,4 +1,4 @@
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 WHIRLPOOL 2e04124aa7eb4e2689b048aceeb8c085a5756bad4c0f084da764055ea7a403623107bc6bb29d00b9b93b45675f4475e145edb4e6a3faf208d9fe36f4a65c9e78
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf WHIRLPOOL ef459d7c053ac70be6313c65edaff095053cab840588d5762834b4402e299d8782401ebf1341ff61a150efed8420bf377b7a7ba10dbed6608d86791e2569e733
-EBUILD ut2004-3369.3-r1.ebuild 3957 BLAKE2B 469b9dfe85e73f3fd7b69e1b12e64c2f15370484e622473ec874c7dba171402bbbcdf904638534a00068dff62df72ec5df49b7252af316205d62d0845e60283c SHA512 7818fbfad3797d977a586036eb607c12db4ed7c500571c49c3c2c847eae5c54c124bed7f4c05bc6478eb145dea6fb551f31bf97e7d6cf014f9047a2e8e067398
+EBUILD ut2004-3369.3-r1.ebuild 3947 BLAKE2B d5737cd41897625b609361390af6fe310f9548b3d7778c8dfe8334798ecd3897b157910bbe1ca92497f80d986c155d99e078a266179e7143b296a84428977a95 SHA512 6b4f7f517e6cf35faa699478e505f65d050f9f3cb68546b96af563f18e8baec3e5ce3e7d494de794f76c62bc37feaa91666ef8f803521a7c726b6cded2461e70
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
index 7d02f16bfb4f..7ea5df936e1b 100644
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils multilib games
 
 MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
+DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="
 	http://treefort.icculus.org/${PN}/${MY_P}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 804e2c827e9f..d712f0f6831c 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
index 102f9b46a0af..a645e8334f49 100644
--- a/games-kids/gmult/Manifest
+++ b/games-kids/gmult/Manifest
@@ -1,4 +1,4 @@
 DIST gmult-8.0.tar.bz2 222981 SHA256 d4ed9282ea160b292e8c842ef761b56d3dafa2e0b229d0ee6b742cabc5a499d6 SHA512 40c29a998d50491de8c14f7e71ad298fb69e0dc6f1f04b1f9bf35f9f72010eb085a9bc7a9efa1f3c339ea44fdeb9eec4d4f82017442c57ebc28f992bc703252f WHIRLPOOL f7c1dcde25bb4fb1aa990f2c0415c88e9c987523128f1a6377b231d148ae1de0fb72672658f77d45d64a16ca4eb89e33bd5b2410e3402e0378e07ca597877cb0
-EBUILD gmult-8.0-r1.ebuild 770 BLAKE2B 55537bd97f9d4dc16d90f82f2ff33b2a49934f11e5ac088e7fa59957cd5dfe314e1c4ca5189a3e57f973c088066f2574106375ceedb87ad6fd181844f3b56732 SHA512 df10bbb6634f39ceb42d4100ed91ae6793e4c4545b571fd7a08d995cdeb7db3ffa3b0b054dca3093eace2b5440b2979825f2aa861d36f49c0621b4916b850f3a
-EBUILD gmult-8.0.ebuild 855 BLAKE2B 523cb054b5b67280fda51fba0fbd0cfb459ce511d5892b075cc7fb0914b0ec56a5846eb7b9152dfc80b8db28c46d7c7392305057f80ad2df0adab998541735c2 SHA512 4bcd0d728f9982b899c06469a6dbc29dc09536221a2cd4811a32076d6b395ed1bd484919a44530c08c266535c51ff43f66e3b570370b6a58066c80220a1f1435
+EBUILD gmult-8.0-r1.ebuild 741 BLAKE2B 67904c4b2287b22bb38d4f5591d7e84ba88039efc16f9b66c622b403064077b529992b41b98c28aca9f00609ebcc41aa63acfb42b26782eb8f34faabb2918157 SHA512 16ddb76af4c569196b98e6fa4e072ed0b3476b36cf986a3d408c8394c1dc4ebbebd0c58a4e7ad700ba831c85dc4c0b99b1c25b5634f0ae41bf4bcc28aa38703b
+EBUILD gmult-8.0.ebuild 826 BLAKE2B 315db3e9f9fb0da5ae81d3a06e0b817d5d1321ed8ccd5963f65afad2a95bb0e0eee63b3939dc26d9a62fe1ab0657137567328394b45148c0b0ae37c82aa8310c SHA512 85d4d328cc03c2d3721b0bc1959b8b15d1e747171002ab299281606718aa87e7a0c9a1b19a6e6a6169a77785de32ff0480caafa9972dca66a0fbe0c2c87061e4
 MISC metadata.xml 326 BLAKE2B f9162abedf00b10abf4c94c73c47af36166cfcad2758e142e7bb8c12f42b59c9cc2b1565585fe59bab2c608c5f42e9d21548c1f1e4006946a9dbf287ed11e57c SHA512 f1271501c503fe7d64e69cd7729804fa3b4c0817e2cedd3b3696b919c5c67ae57917a66a326dc7501c5ced7d2e8e8c3cf40eec1a2545cb00a9226bca9ea3a5e8
diff --git a/games-kids/gmult/gmult-8.0-r1.ebuild b/games-kids/gmult/gmult-8.0-r1.ebuild
index e64331e0cbfb..b72258066123 100644
--- a/games-kids/gmult/gmult-8.0-r1.ebuild
+++ b/games-kids/gmult/gmult-8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils gnome2-utils flag-o-matic
 
-DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs"
+DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
 HOMEPAGE="http://www.mterry.name/gmult/"
 SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
 
diff --git a/games-kids/gmult/gmult-8.0.ebuild b/games-kids/gmult/gmult-8.0.ebuild
index a9fff5d730e4..6bc15d4f201e 100644
--- a/games-kids/gmult/gmult-8.0.ebuild
+++ b/games-kids/gmult/gmult-8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils gnome2-utils flag-o-matic games
 
-DESCRIPTION="Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs"
+DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
 HOMEPAGE="http://www.mterry.name/gmult/"
 SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
 
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index e4342b3116fe..9692215c45f7 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/bsod/Manifest b/games-misc/bsod/Manifest
index 6803d05c6f8d..e436c64ebc9a 100644
--- a/games-misc/bsod/Manifest
+++ b/games-misc/bsod/Manifest
@@ -1,5 +1,5 @@
 AUX bsod-0.1-Makefile.patch 464 BLAKE2B ff9a1653fbbdde19337b5bfc1ba19467917acd9107ca62ed42def5cfb1262092b46e1e5de70f105ae3fc9d5a7199449f677651a909f81f7b7dd4c7fe84e986c7 SHA512 f5cb0912a1b851a7f6bd7d4cf861b11a1832a47674d67632343474f5a7c6e5dbde7c2a1f4e217e2df293c8ea9c780d7de6aa14fa6ce5d07a2b5704d57edbe2a3
 DIST bsod-0.1.tgz 10128 SHA256 ad6eb83637d1eb655ca7891933916266bd0624e08823490083b960ff15531c43 SHA512 2b3087ee495c83f41c2c582dc1c391ce5b73600244b6183abbcd36a3f88caf16987250d4ad23eb3a556b014669ddd84947e6cddeb8d4c89e12c9bacc545299c8 WHIRLPOOL 3317001c0502d50166aac13e252b1f0413f7af71e5cf2cd84c055629421fb9ae153016421b43477e5eb3acba3c9b3243d2a670630b1b6388d46828378e4197e5
-EBUILD bsod-0.1-r1.ebuild 611 BLAKE2B 4af847b13fd6855ccc87a60f55146ea1d0f26e332c6f074197d14b712416fe8bb4ad188e82ba4ca3e4a3782ea1617b4220289333e04fa7082b070306b2e49471 SHA512 61bf652f9ae8dc2b1239f34ef542fe9195581af0de37cd998b260c6db988ec730d80154c1be1fc461712d6718fb2bf00829836231ef0da49984240b83b872c2a
-EBUILD bsod-0.1.ebuild 622 BLAKE2B bd542ed9ba116355da9a3d176a0ce1c13d49dffc1bf7e184c7667926c29670c011d0e9f079925d7795efe2f153f7bfea778ac52a952ac89286bd0814bac4e00b SHA512 67455807757641ab0afa03421ee189ce4023956220ff1a61839798d9e7c8316c692b44d9452139efbe3d88da9142218a86bfc7a7e6197e6a7023b22be2215936
+EBUILD bsod-0.1-r1.ebuild 600 BLAKE2B cc30ff1ccfccff1d84f95a664a766daaae3e84b5c3704013e116fc010c6c95aa86acf83e563630a30c69bca68369f70211741922f1268d8660c4df4b63a7a582 SHA512 82bb7e45283cc0466c7d917b2b780117a9253fcb9105e10a29dea63541bae8d6f9be14b0e4299db9896ed7ceeffda5cf2c6944d6ffe995fb133aa54db72ac978
+EBUILD bsod-0.1.ebuild 612 BLAKE2B c99b789ba75fa3ab9365a8096634bd7b1374b1eeeea6804d5461e4f3cd012789ba2a3e00995fe4ec95f6686bd65ce20d55e14ae20d69e15fd88165002b38b1a5 SHA512 4025d96275a86ae75185a9472643d4d6edc4076582a1b21b5e389276714e392d88ead5b4300f0296dec3b9e6d1d11706f10b34ea78a62abef810c202bed16119
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/bsod/bsod-0.1-r1.ebuild b/games-misc/bsod/bsod-0.1-r1.ebuild
index 40bcc76c933c..3c9c455788c7 100644
--- a/games-misc/bsod/bsod-0.1-r1.ebuild
+++ b/games-misc/bsod/bsod-0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils toolchain-funcs
 
-DESCRIPTION="This program will let your UNIX user experience the authentic Microsoft Windows experience"
+DESCRIPTION="This program will let you experience the authentic Microsoft Windows experience"
 HOMEPAGE="http://www.vanheusden.com/bsod/"
 SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
diff --git a/games-misc/bsod/bsod-0.1.ebuild b/games-misc/bsod/bsod-0.1.ebuild
index e8ef4f8cf1ea..181c25c61d27 100644
--- a/games-misc/bsod/bsod-0.1.ebuild
+++ b/games-misc/bsod/bsod-0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils toolchain-funcs games
 
-DESCRIPTION="This program will let you UNIX user experience the authentic microsoft windows experience"
+DESCRIPTION="This program will let you experience the authentic Microsoft Windows experience"
 HOMEPAGE="http://www.vanheusden.com/bsod/"
 SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/Manifest b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
index f893a03c6773..9f0b469c1579 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/Manifest
+++ b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
@@ -1,3 +1,3 @@
 DIST fortune-simpsons-chalkboard.tgz 5803 SHA256 8cfa7ecec784314b90b46531943d507c8f556c96008c8dc44089f016e5504b35 SHA512 0ce3e8fea577f018d933c64aa3aaeac859ebbb9d0faba28f6c1f5f330781109ad43f4e317281d75b95f87cdb6476e6393219eff5f7ee5201219ff7e007452255 WHIRLPOOL 7331d08e1b9904c66270e875f2b5e4dbb937abec96fd0f55e5801e52500b0c4dc5c92a188ec1faf2ff7b372daf6c1ffac8c7ecea279838acb3bf9d6727b69609
-EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 695 BLAKE2B f28b8c8cab45073518aa6dd8a1c5d6e70303c62e7901e6f82664985562ee4719f06622647a44d2c65ff47676158bf92831aed533c44fbab4d0b0d35ae1acc19b SHA512 920d17667d9906509698afd2a3b50b953206851d48fadb8612b97777ffa74ed839a5e7cdcc79f91bbab6a9152974695fe9b027ea02dcd4d497c4861b50646388
+EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 692 BLAKE2B 6582144c86d0308381f5177cbc00dd9b3e35920341be5b74d2f10d32c016f38b582d5876e6b5657522a0a8d6f8befd4e479695ac4bdaaed8c6cc7816cc723972 SHA512 0c3ea8f13cac18974152ce851884c6d2b520138f3af27036c4403d3cc63a09122fbdd9f370c659229b13dd777fcfe93e0855dec101fca560f7a311419f3385c1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
index 130da2974523..21b3bae44dcc 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 MY_P=${PN/-mod/}
-DESCRIPTION="Quotes from Bart Simpson's Chalkboard, shown at the opening of each Simpsons episode"
+
+DESCRIPTION="Quotes from Bart Simpson's Chalkboard, shown at the opening of Simpsons episode"
 HOMEPAGE="http://www.splitbrain.org/projects/fortunes/simpsons"
 SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
 
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 70ea9c1b2eab..9f971e05d890 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -2,6 +2,6 @@ DIST katawa-shoujo-1.3.1.tar.bz2 496188604 SHA256 ec5a05cfcf1d5981ecdbfa71904c27
 DIST katawa-shoujo-1.3.tar.bz2 496193762 SHA256 a7fbe9330e60a5457ce504f20de357191f0809beab345a9c00974fedd74ae573 SHA512 228ea474746541e0f812789a504c75005c9f3d496d9a255aba77ed926cb6302ed9815126b5facba6a29e560fbfca2ac2d584c62870157704ed7e99c9eabed9b6 WHIRLPOOL 3ccd9d9f555e817e805fc294f41bd0d7c0937ad71bc31d819be54e0bfae4a8a4e4cedee7cdff4cff7f389c26578a119989c7f029014992ebeb5a6afa9dc55931
 DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d696e5b372e1aacf176778df45 SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e WHIRLPOOL d2b06b26d2ea5bae5292fc5e6f3f4571fa82a4f70155e38a3c8a21778caabc37b2a13b2cb7637a0fb05a55243a63e23c96d0538bbcbc631810f15c069d26f590
 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584
-EBUILD katawa-shoujo-1.3.1.ebuild 2048 BLAKE2B 5d6d0d2ee1027281f3d335bbae7473748d22d06125064820d43c492db7ff2e98c3bcd7f658dbc20288071f351fcea5c59920dc6d01160c381e72cefd0a415d09 SHA512 74ab33bbfe2e7ce3bd77aff8fafb591b8766cf299b743c83a4abc68ba8cb476ddfe2cecfe00370d3525dd9f7bf957b33e73dad5ff968ff9031b192679a5069be
-EBUILD katawa-shoujo-1.3.ebuild 2260 BLAKE2B fbb003be9f153b2bb824e86f1ce703bdfb5d3251e39fbb3425d1b7059f19877e2e7d8ea8d608eb44c6c71b02973ed88e44f6af0f208324de05907c1ae9265493 SHA512 2f846e41feb95776242d24997717644b4a282fd33e8db8f73a4de59a0922a1e421c2d8b60a209d2475953cc4d42a33754c247074b281375aa256982e13fef03f
+EBUILD katawa-shoujo-1.3.1.ebuild 2048 BLAKE2B b3f5372e32d343924010003815823a44868533d9f63ba0afa314e10d3a14df676850acc53134e49807985f0ea8db41d866a8b188b27fab5ab198fa32b57096ce SHA512 1ec46aaa73baa5779b4348d9eed48128b8d3b17f6eaf8b186f9e9016ab9d1a3838a3c4dc9a318c8c0092ed78e51ead48472dbb3f8a18eaa4ace81ee0cab55efc
+EBUILD katawa-shoujo-1.3.ebuild 2219 BLAKE2B d64da0d541eaa4ef4ec08dc4caaa55ebb3445f00b4aa76e16699977de874fcafcef9989970bc9d8f8e8a0a62e5df949cc10be77fb8620162fbcb76e29e793002 SHA512 f0c239a9e9527b6edc42d2e675d13d523343f19c797507ba76b904105fc59ab7eb4a2233997cfd8d5c92ace66e05effe6e3b67812e2c4ddea07916896566d8a5
 MISC metadata.xml 1441 BLAKE2B 67b1773decdccf368d2a6ff042f84c871cdc2c780b0df47ad417d0f50aa524bcad0684109068d9b220740d8f5063646b29e974d345b6f049162a803ee5568287 SHA512 57b626a95cd8a7ff92de13b1c1a85124ee2e3dd0e9860a57cadc62332636ee6df7cb27c9428658b17002af70b949af64f432de82dbd838f2edb6f423039812ed
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild
index acf935e160e7..14ba5a9ef213 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils gnome2-utils
 
-DESCRIPTION="bishoujo-style visual novel by Four Leaf Studios"
+DESCRIPTION="Bishoujo-style visual novel by Four Leaf Studios"
 HOMEPAGE="http://katawa-shoujo.com/"
 SRC_URI="http://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> ${P}.tar.bz2
 	https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
index 3cd733bcd7ab..00e02f7499cf 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils gnome2-utils games
 
-DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children"
+DESCRIPTION="Bishoujo-style visual novel by Four Leaf Studios"
 HOMEPAGE="http://katawa-shoujo.com/"
 SRC_URI="http://dl.katawa-shoujo.com/gold_1.3/%5b4ls%5d_katawa_shoujo_1.3-%5blinux-x86%5d%5bFCF758CC%5d.tar.bz2 -> ${P}.tar.bz2
 	https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index a6a4273ddac3..e821e9b13e90 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/gmudix/Manifest b/games-mud/gmudix/Manifest
index d6d4cd2f9a61..8c0369e358c7 100644
--- a/games-mud/gmudix/Manifest
+++ b/games-mud/gmudix/Manifest
@@ -1,6 +1,6 @@
 AUX gmudix-1.0-as-needed.patch 1086 BLAKE2B 8e85a01154f336450888b8e42939a7328ea90ce17c6b05e72fb15d25fcbbbadc026af7f0a08803701c049389c9bfa5f9f210a813c7964446f3f52c1660aa7780 SHA512 74abd6878a94ab149977baa665c11881f56bfc33b8515bce9fa1582c488ea765f7ef84e65dd45c6fdf681f3e1d21d8052319c6e9b56da6da8180e2de1c69cbdc
 AUX gmudix-1.0-format.patch 514 BLAKE2B e223a4b8ba17237fed51c3f0eb3e541c4589e8d85a82e84caec693970af4d334c5a1018214d4c5cd754db37e73a3b87a773ccb6427dfb707472a16cf4f731a9f SHA512 009826ea4ece40a7f1face057eca8161d517aa5e498a3dc4cce84b8fa1dbfbe4bd5e0dff93cea8cc60c312ceffb18b857266062762d8f60681e25df67cd8bce9
 DIST gmudix-1.0.tar.gz 137548 SHA256 92588f498f5188ade961b7fd53951300236af105a72d0ffbd586d03a13008b03 SHA512 c22a725af6914d5177a737c1abf1ee38c133854fab8723dc01a89739b58214937008c3931ccc5928e88ee1ecbda385304ff862606eacec377addd6ee8de02b38 WHIRLPOOL 1467d80d629232e6eabbc75e111e652d458b559d6d7edd749a5d9479c2ad9502aba700ed8e072254b9fca991a2868b3ef5ba0a19b3f0814cd6f2326f85dd977d
-EBUILD gmudix-1.0-r1.ebuild 735 BLAKE2B 6bf898e9171b8e54075943b4a95f0180c3eaa039be080ad0353c7a61e541a5f9750738306e0b7864bfc9920ccf3f9fe856a8372d39223a81b5a06a012f20ade4 SHA512 77aac12fbee6c16f269e19d27019dfcbc9036468daf9d98838e2d3d51e85b2a983212a8bb774be2c6fc725cdcafe2300b5b8f6c5d5e64d62fd10fbd071700558
-EBUILD gmudix-1.0.ebuild 748 BLAKE2B b3b7c8b26bd0a8d5cfc6a3631ddd77770da1c356d46af3f6f3e83e68d64226c849094fb92ed70ab471574577c0003d522364960af000bb26c4c6e81fbcc914c7 SHA512 aecb3f75840fb7db2cfdf5174b6a5cd0d0efec37f3a48b75c603edd14c72ba23cf1650b254e6044eebdfd7980717f22d613e8bee686b01e8bf9b4f2a5cf7dd69
+EBUILD gmudix-1.0-r1.ebuild 700 BLAKE2B 5a5425181665122036de40ac91f36b450c6641ff8783e1dfb0d07e874c7462518b1c764348a86baf605f9983bf93805d2b0ffc919a79f4d0851051d6e7638ba1 SHA512 060e0970cc1eca5a1baf5df5fdd13a344b90b60447bceea033f6fb4657793b7039d510053a0f4ced7a038767cc4ad5a30600afdeafc06702f83c51979d8ec2d2
+EBUILD gmudix-1.0.ebuild 713 BLAKE2B 39a90cbcb9b42184a2d40e460f2b9380a197d76661a0aaac8be652647737bc996965c48afafe36034f76e5c2d327be9cac541712d4dcf19bfe1f1d7d67426e0f SHA512 5aa764426e0f42f55828cb19749cef438079036f8f6ec819239391a1dbab6cb6a2e249f136dbc302a5e20a7f1dfa094a45ca1855483bebf112c23b95312f365d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/gmudix/gmudix-1.0-r1.ebuild b/games-mud/gmudix/gmudix-1.0-r1.ebuild
index e53de366090b..fa4c5f6bdf05 100644
--- a/games-mud/gmudix/gmudix-1.0-r1.ebuild
+++ b/games-mud/gmudix/gmudix-1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit autotools eutils
 
-DESCRIPTION="GTK+ MUD client with ANSI color, macros, timers, triggers, variables, and an easy scripting language"
+DESCRIPTION="GTK+ MUD client with many features and an easy scripting language"
 HOMEPAGE="http://dw.nl.eu.org/mudix.html"
 SRC_URI="http://dw.nl.eu.org/gmudix/${P}.tar.gz"
 
diff --git a/games-mud/gmudix/gmudix-1.0.ebuild b/games-mud/gmudix/gmudix-1.0.ebuild
index 88c3e7e0a10e..90a474fcd69b 100644
--- a/games-mud/gmudix/gmudix-1.0.ebuild
+++ b/games-mud/gmudix/gmudix-1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit autotools eutils games
 
-DESCRIPTION="GTK+ MUD client with ANSI color, macros, timers, triggers, variables, and an easy scripting language"
+DESCRIPTION="GTK+ MUD client with many features and an easy scripting language"
 HOMEPAGE="http://dw.nl.eu.org/mudix.html"
 SRC_URI="http://dw.nl.eu.org/gmudix/${P}.tar.gz"
 
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 41ccbb16c849..7948ff256783 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
index db0d5518b76c..4b5c74becd29 100644
--- a/games-puzzle/atomix/Manifest
+++ b/games-puzzle/atomix/Manifest
@@ -1,8 +1,8 @@
 DIST atomix-3.18.0.tar.xz 262624 SHA256 3751cb2810bb993fd71d2a8441c4e08dccd36042ff02b7175c7c828b62db1de6 SHA512 a5d6614d9d4a0a37ce2740bf0e1fce5632fb45ea1d878868f13fde5ec2d8ed13d9ea12e7af5bdfc91f64cba623fb4bdf4c48a2a67331443101ebc0dc40d4dd95 WHIRLPOOL 5d4198912a3a4456d0de2dd01dcfb6b433310297a2011841937b0d7c7d3bca061da6c8eab9f7bd1f7998c0ef086362a904b0b27a24fc64e9cc8d4db872d7a5c5
 DIST atomix-3.20.0.tar.xz 573180 SHA256 d7ffb2ddc8efd4af11986296b051be0af5bfe2226dac2b890290d3b285dd707f SHA512 883622952916e339710f31b89266afa14fee2b305bb4e68539bbce0cbf518490c60178d71fc1192ca07e35222ff6669afac8b824af8fb80d5f6b63f0b4fb5076 WHIRLPOOL 710b03090d356f2c19083d727812b5e66a49c02e1ae9f6f606c12afd99ca69f51381815654f13e7b2a9da504267263270b1329477b70c2dc9f59b1cebdc6be5c
 DIST atomix-3.22.0.tar.xz 551424 SHA256 95caf79181381ecc1725fc76b937a2440640739bb4cfbaff91db79e714e7427f SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212 WHIRLPOOL 50fbf803b878c720fe5d975b88b1c1d853a2e24028f6c373259fe7f69b1db59e99580f3f42b0af81a477bb3e2cc46e0bed558f9a08efaa9d0870f57bc37cd062
-EBUILD atomix-3.18.0-r1.ebuild 580 BLAKE2B d1a56835b1a750b311dc1207e8f863983fbbdb4e1f74b76d39afee7a544b4a2828513a9c09ed9b6fd0fd5a16b31a5e4f5304fb084b3953ef6372f928d204c492 SHA512 dd906bc9373f8d2b01dff383866772b5715457556a35cebc7ac10817b6a99695978fc5dd2892b7294a1104d91a7d16ddc94d9cfd3b80523d79e48c99ad53a6e6
-EBUILD atomix-3.18.0.ebuild 585 BLAKE2B 55b635abc514f9239949576fec00f64483f9230cd665668511c02c83515d9e1aad69b8bcd33b371bd8020a3c57f7f2d5ea887ca01cc73632e378ff04bf5a31e9 SHA512 eeb32aa372c52ce98b3d19dd6dad33fb369436d46cb31744f25e63959b901faaff55492f7a9d206be9032e11ffacd99eddc7a03e3f7bfa1df5f810abb3f43b0c
+EBUILD atomix-3.18.0-r1.ebuild 558 BLAKE2B 8e5eea337f63c51853f10777421bc69971b4c14f95d31541ff77bc1e110653a5a8c2dd5d40de05f12407466a76940f7be174f557051e7aef3ef961906ca89038 SHA512 69749bfd47b87b0ec9a3ecc73e0d47f2e1b0464bbf9dd7d59c173b96285df62080ae4acb257f2c513fbb2a0704214d08f8e7a326754025a60980f9fb852dcfdd
+EBUILD atomix-3.18.0.ebuild 563 BLAKE2B 6c1ac658eac6321e23225d6f277ca309762074bab13a19c41c786a05339fdedd79f44cf5b74589464d4f39ceba4b17ad668f6ec005ff46dbdda11f1d13433736 SHA512 d3c821f6395c493f42bea32c385d005bd75bf85afcc918d8d8fd7ebbe1734c43227bc0416dcce8830f753836abb06d61f0b6464eb525e1c9fa65257daa347e4a
 EBUILD atomix-3.20.0.ebuild 558 BLAKE2B 8e5eea337f63c51853f10777421bc69971b4c14f95d31541ff77bc1e110653a5a8c2dd5d40de05f12407466a76940f7be174f557051e7aef3ef961906ca89038 SHA512 69749bfd47b87b0ec9a3ecc73e0d47f2e1b0464bbf9dd7d59c173b96285df62080ae4acb257f2c513fbb2a0704214d08f8e7a326754025a60980f9fb852dcfdd
 EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/atomix/atomix-3.18.0-r1.ebuild b/games-puzzle/atomix/atomix-3.18.0-r1.ebuild
index a36896f331f9..42762674c192 100644
--- a/games-puzzle/atomix/atomix-3.18.0-r1.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit gnome2
 
-DESCRIPTION="A game where you build full molecules, from simple inorganic to extremely complex organic ones"
+DESCRIPTION="Build molecules, from simple inorganic to extremely complex organic ones"
 HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
 
 LICENSE="GPL-2"
diff --git a/games-puzzle/atomix/atomix-3.18.0.ebuild b/games-puzzle/atomix/atomix-3.18.0.ebuild
index c3a9cbc8b2fd..03bae81ac35e 100644
--- a/games-puzzle/atomix/atomix-3.18.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit gnome-games
 
-DESCRIPTION="a game where you build full molecules, from simple inorganic to extremely complex organic ones"
+DESCRIPTION="Build molecules, from simple inorganic to extremely complex organic ones"
 HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
 
 LICENSE="GPL-2"
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index 6fe150f29fc6..47ee625b1c1a 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,4 +1,4 @@
 AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
 DIST galaxis-1.8.tar.gz 8962 SHA256 bc36c7e5b1e1d96e5a8c6cdb117b3891833a99e99df709c5531c7d44009a8adc SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f WHIRLPOOL 719323349e747473501fb4bd737cb7db8b719dd22e5dfc3d0f7acb9402618064206311101a466fa37037381781094b8c90348171e6b8d2f04b04539e96af72b0
-EBUILD galaxis-1.8.ebuild 598 BLAKE2B 2de32cf35dbc8dc166b013df996f4a8d149f6814a748be7f2c9752d1fe727f4b8c2cb4044f544717777e8d5dcc62e4ae587da13fa48f3ac4491fe7d508634369 SHA512 e364f0f16f05a6fe042ff8af600b25823985dd3e3065fd852c261a498fa47cd2727c841417adc48ede895c471645b921eccd33ea946aad8560f19b9db6410029
+EBUILD galaxis-1.8.ebuild 583 BLAKE2B a50ae04fd6e358af77bcaa6e1406af138f9ae80ec1c7cc735c9df45add298c94c7984a3134883b1cd69f347878a6dfa3518a2d8f89e6a87fc9880732c8fa902a SHA512 d24f71ddb7cf878de764796d90ae8de51526f4a91244fadca13fb55435a71be6746f94fa6575f48c2445b0da840156d3c611f41623bee73a778a3cbbbb2d44a3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8.ebuild
index 12bd540ec67d..1fee81603db0 100644
--- a/games-puzzle/galaxis/galaxis-1.8.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="A UNIX-hosted, curses-based clone of the nifty little Macintosh freeware game Galaxis"
+DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
 HOMEPAGE="http://www.catb.org/~esr/galaxis/"
 SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
 
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
index ef506a936522..86e9536fd578 100644
--- a/games-puzzle/mindless/Manifest
+++ b/games-puzzle/mindless/Manifest
@@ -1,4 +1,4 @@
 DIST OracleAll_050523.txt 1280717 SHA256 8c0384da067477f216af77ade0ff2680e9315072406c340700c3993d3786e34c SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5 WHIRLPOOL edfb8bcaf6923953358b24be12afff981bdb2c2a72c9d86455bf8d121dcdc5c2180959eb2f09eb9e6c30227dc898adeacfb7421e6199bfd2cf22c3118b16726c
 DIST mindless-1.6.tar.gz 85620 SHA256 1f3c413f6ef96ce380392a39151b5761a8c2a67249402bf02fc582f3d7837eff SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f WHIRLPOOL efccab674ce10c885be0dfdfc2c2060c85b7ffa691c46a22bd3acab20357cf39a8ee3a0eb8bacda39d51945269ac000d888e2222c3d8a1ce5f06710d334a8bb8
-EBUILD mindless-1.6.ebuild 1246 BLAKE2B b35163708a56dfabe0cdeb21eb16552ce450b357c870bf828787bf81be3cc08040e7f5b593249ca41b5b5c0c8428e4a5a3f894ddd1eb21c257cb508d7646059e SHA512 a07c04a1f819b3ba7a55161d6a5c255e913cc3f28e39a89e322a55a0ff39c29f1fe3015e36575a396273528b556ccd41519e92f8b1e57c8b5d5ebf41d67a263d
+EBUILD mindless-1.6.ebuild 1219 BLAKE2B 44f6dcff8980aa7455a4e6aea55c14509142cbaefc06dd9ed34bc5b45b67449f7858d297995336c984bf266e8ff767d039b3ec0185d22e7ade399c698ace6330 SHA512 daf1d1b92265755623e86d641331b0c2aed20a0b1d2f3fe71c0888c3072783b34509fead4d750dccba88d64e6459fb06d6cb956bea506184253bd439a725bb46
 MISC metadata.xml 331 BLAKE2B 7663f41ea5c4e0ce0680d1815f4d62ff469d25274a253aad5c9597836eaa1fb392636730c25b4535ecba191518b8a4a5cbf2f6cfc58767dcda05738bf3157f30 SHA512 bae00e9836e3224a3f2c4fc7c6be572153b8693f42de869c4670edc2c5b8f103182a5f7c97ab2abd7744a29b0ed30f2c5dc56c7c661bdc28f14aaa5355eb5b5a
diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild
index 6e89425c8079..2bc3f3b408c3 100644
--- a/games-puzzle/mindless/mindless-1.6.ebuild
+++ b/games-puzzle/mindless/mindless-1.6.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit games
 
 ORANAME="OracleAll_050523.txt"
-DESCRIPTION="play collectable/trading card games (Magic: the Gathering and possibly others) against other people"
+DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people"
 HOMEPAGE="http://mindless.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
 	http://www.wizards.com/dci/oracle/${ORANAME}"
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index 871f0ca9630e..ab299d988cf4 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -20,5 +20,5 @@ DIST szymanowski.npz 2577 SHA256 2ab70473acc4b66a5946f6462ef9efc80fea5d8312edc43
 DIST therealbubba.npz 6684 SHA256 fa23a79cbf373e88585c80dbea3bada09d6c0044278c53f8fc1bcb98738e91db SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6 WHIRLPOOL 6e047cc423bd06b549558354e1de1b6c2a61c1b6d281091569cb5e89a46957b9b5f0c72643a5d18d4a9dee0e37bd24e1b22a2704bd55546a6bbe6b4bd5c4766d
 DIST werre.npz 7739 SHA256 8df9dbd75bdb1efd806dfac29e06ba18e94833eb6d82919d5c1fc0178c054bda SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd WHIRLPOOL c5208f787ba5d59227c45a7bfaef4d7dd4d3efc392c8b315f7ffe563a24279cbc327eac27f36efea0362836939602825409508b5fcb68cceb86a4412053cdec7
 DIST zeez.npz 8633 SHA256 50dcdb465fa8c29c0e5ac93748212315220cbe25f03f10527ebcf839fef636d0 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41 WHIRLPOOL 4475e52033c2d6ef951ebdaf7ce7cd68223c2786a1e845e63d3f99925b1ac3ad5026160cc5b199ed647cd0ced4d5ec8a7888bf03396f8b724e36cb1f137c3b6e
-EBUILD numptyphysics-9999.ebuild 2815 BLAKE2B 63d9591c623754da31c3ff0bccc085c4b686df5d0c0505c4292473cf115108a22e12e0b6c4120fa3b854e50e54bf6f2901a36cb6e5fb7d0e58b3a12afa8a7a92 SHA512 9d4ba4db9ab83bebc24be10e4f5f0ec6f3da996a3180a544e9330aff02fdbd85c334a22ab07088b880bd39ae30022055331236eb640f287bdfdd286d540e5edf
+EBUILD numptyphysics-9999.ebuild 2801 BLAKE2B 4cbbf259468caaf3fb8c95f469fc894dd7dc793c065b2e19b81dcf63ccafa211d12aa08f8db99f7ff3dea8f06875ddb9de9c5823bac4837a59743eeda78e1798 SHA512 a0ccd8a022a2984722c2b611652ff938753f2655637245924830da8bf50709c3e9a700ee59fe72f9e6bec4770029429eb212e1c88718dec3052fae58d1f50cff
 MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index 9539100497af..aed85c6e8840 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils gnome2-utils flag-o-matic git-r3 games
 
-DESCRIPTION="A drawing puzzle game in the spirit of Crayon Physics using the same excellent Box2D engine"
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
 HOMEPAGE="http://thp.io/2015/numptyphysics/"
 
 # This is only the SRC_URI for the user levels. The code is in git repo.
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
index de8dd1ec98e3..e2901cf37642 100644
--- a/games-puzzle/tod/Manifest
+++ b/games-puzzle/tod/Manifest
@@ -1,4 +1,4 @@
 AUX tod-0-makefile.patch 332 BLAKE2B 362cce9d762fec5116fd97c10026a327e2b45650e456e8e23e4ec58a96c65ddc8451f8d9a2278fc9d37fc033f84d7f1ec481b8b963d40df82e3d118c31ffb88f SHA512 2490154631db2fc66bdd6ea9dfd8e584625b2b416395450b2e054d13d9ea5b327cbed4fcc66e6586f4746a21429ed709f05cfb8c7c6a5e171c1a001663a4d245
 DIST wintod.zip 115653 SHA256 92265cd3266f5deecca8aba1f00bd68af2e758e9b00cd97f92ff487d05524686 SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc WHIRLPOOL 4a3c2dd4d7a787d7b22c74ddf8db331a776677c2b32546d6f237df0bf46970404018edb6d1beb9865db2f1e6d91e6648a421e10ebd58d9f3c8466abcc88c2f83
-EBUILD tod-0.ebuild 753 BLAKE2B 9dc03f2a4e3c297c850ed99fd499d14787eefcff2358c231d825ed704a2cde5d5585a939a12b5e56b9a6d666eaf8274f60d749141f7594747409f1974965d5a2 SHA512 df4285be40ce2b90b8baf1fe73bc45f846aed9013c22053877bd325020b8bfa4fd35efe24d391eb4106736786eb415fc6fea56fb552fcbc56f9b3e1dd6cfdf95
+EBUILD tod-0.ebuild 730 BLAKE2B 567c5df329a6f4ba4dc89a661f23d569d0e9e7edd59f1163864e0b7f30b3e7b05de95bc89dc190d5531826a50107153631898085c5dc28a1fed515a306397e1c SHA512 722f623ec308366f1df18309245c89f24bf2afdcd2e6ef13640dc33c9d0a6428c4a3e29ecb114bd3abe35aae39195505a08da8849078c25e708ff24d3961592c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0.ebuild
index eeb59a66aa22..98278d52a037 100644
--- a/games-puzzle/tod/tod-0.ebuild
+++ b/games-puzzle/tod/tod-0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="Tetanus On Drugs simulates playing a Tetris clone under the influence of hallucinogenic drugs"
+DESCRIPTION="Tetanus On Drugs simulates playing Tetris under the influence of drugs"
 HOMEPAGE="http://www.pineight.com/tod/"
 SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
 
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
index 7bda83df6a10..40e086ef0118 100644
--- a/games-puzzle/torrent/Manifest
+++ b/games-puzzle/torrent/Manifest
@@ -1,3 +1,3 @@
 DIST torrent-0.8.2.tar.gz 555686 SHA256 93890ed9287061f6b8d63993962c188013388fe7cf4d3d334ca7e72cc3209a67 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692 WHIRLPOOL b2a360bc6a20d8de67cbeec9808c914f4b1120b029e5367658ebf9ee46195fa63c9ca70fa41f5ec4adf3da744175aa31ea720564a5ed4ccb01e464ab274fc423
-EBUILD torrent-0.8.2.ebuild 719 BLAKE2B 9605070bd996932736f0d1ee221e9d7ede1b4eaac5bc3c772f89f14f0ae78793bc95e02772c8d1742d75ec3499e0d221d49b73a57164fbb41d7f4e8ee08ecbbd SHA512 8910394121b1d6fef2cb7a6e7d06a8e0e8d6a35fce38487c5b060f9058d7c64bf7024ffe2d959f23465681c9968fa4b0d65395bbf0118e55d4521db063850226
+EBUILD torrent-0.8.2.ebuild 699 BLAKE2B 04e5ba0dd10038f85d8406b3fafed1587dd331a0968478df5a4012dd2ab96a636c8010f58e9179f8cd79934a8091cf38383488402f6e199d2ca0090a131db33d SHA512 6bddc2ffa49d08d21aa8941705625cbdf2403405bbf4347fec5202546f4595c36efbeb1014ed4dd17f149583d102498dbbe7556857bbc6806e4db1adc5df8573
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2.ebuild
index c6b01b28bac8..44b959583284 100644
--- a/games-puzzle/torrent/torrent-0.8.2.ebuild
+++ b/games-puzzle/torrent/torrent-0.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit games
 
-DESCRIPTION="Match rising tiles to score as many points as possible before the tiles touch the top of the board"
+DESCRIPTION="Match rising tiles before reaching the top to score as many points as possible"
 HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
 SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
 
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index ba37717218ed..06c98d740f59 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index ed5d6029ade6..25652b5fee7c 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -7,6 +7,6 @@ DIST stone-soup.svg 68546 SHA256 f2b476f57f6e8a9b56bc20ec2da0accac9376fea1ff3e4d
 DIST stone_soup-0.16.2.tar.xz 27843008 SHA256 49d5947abb341eb7f0590fa538c475e68ea954064c615d852de968211b68780b SHA512 fc48a1161028fbfc3c1b91bf717ffdeb761dc03a12aa8282f2235fe86368de343dd91ee33371fe4f682f4f84a8fc339d6984b6357527c3cf0c4139cb69cd5633 WHIRLPOOL 2016018e438e857031c382e53e904126efd7006a1da4b954b3b5eb4f5a9263e8535e7300fa8f54f8a870bf99b362cc0bdda630ea562e2f786e3d88c5b38d0c54
 DIST stone_soup-0.20.1.tar.xz 28372712 SHA256 77d238bd859166e09bbf56127997f810d1c9794e1cf4a0d1edc0687b6f194dee SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a WHIRLPOOL 1057a0b86df62ebf8491274b37719691c4c709feb478c684882c465a7fd2c8f977bdc7b6a9c2990a47a42c2ffbdf4187a4da705a3c31e0a3a174e909af8ebc34
 EBUILD stone-soup-0.16.2-r1.ebuild 3645 BLAKE2B e954b44e253fcd784533a4d341e8c4f51503c338e562ba021c7a7d11faf9a548935f9f1f5beb8841621bcf06bc39994bf93e2855812a2132e87ac9a6f3b811ed SHA512 a0e2283fb4450d32ce0fabca94938a62347ca8c3e19c44a2bd84d325464370ac54cb4b363287b169346a3b566bceae7d677008a124407a73fee033dd78401c78
-EBUILD stone-soup-0.16.2.ebuild 3740 BLAKE2B f7ca09f32d1587cd99b93c798fea94febc78f4668ee876a729b302a10d0fcf39edd375f7f1fbe51cc924661394ace5f607b9f975ddbd3eb18af1d6692b300e38 SHA512 529de9a8207939a38c87dd030d7cbda614c13aee206cff5a647361722f1aa65481a05be53049aae5d20cffe01c8b479d7dbdbd5f6cee76e18af2dbfc2758d48f
+EBUILD stone-soup-0.16.2.ebuild 3710 BLAKE2B cd8dc8a731ce1ebed637e58f5fed75015577493a35b148899e4e8ecd93e8dac055d62cb61e94ac93e758259b4384a833ba749bd1d7383b4da322429c3ca03dcf SHA512 ed832b72940575accdad900ed8ff8e16c43d2e4131fbb0f69aaa197ed7c6a423f20e50fd61e48d9b9966f271b591201ea7828b9e07f2e4429c03785d3e9a0082
 EBUILD stone-soup-0.20.1.ebuild 3567 BLAKE2B 0a0bff0d0242dedb2189853a937d0d4366b78cdf457639a0d7bcf42757404fdf5bb250f69a4fce91b844f551ff2ab2810fd33618c906aaf13843598183ee8bcf SHA512 f796f07117afbc7f2051e1423c8192939aa3edbcf427be5ca0bb86d12f377280fc10b13850420505a423ad1f8a8153ac72800bbfee31441c25183b2ced45f137
 MISC metadata.xml 1666 BLAKE2B 511a0c94d2af8c80f9d5154e6f34158ea4687c699fe1ac9cb5d18293581750992dabb48bd1ebdf29b3abd69ae0c51b90c57da0988c57239a0cb1707a956989e0 SHA512 e3d0317f0aca8cae787aa7e659d07f6cf024ce7a983f87b1c54e91a955df96dd4daf570e56eb73c877601855b0fe26041943672dc2f51e5208742e91dd3e84e7
diff --git a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
index b7128188ed4b..a1e923542580 100644
--- a/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.16.2.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="manual"
 inherit eutils gnome2-utils toolchain-funcs games
 
 MY_P="stone_soup-${PV}"
-DESCRIPTION="Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons"
+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/stone_soup-${PV}.tar.xz
 	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 0158845b692c..d002860fc305 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
index 1a4aa912cc2c..36a0a5150cd2 100644
--- a/games-rpg/bass/Manifest
+++ b/games-rpg/bass/Manifest
@@ -1,5 +1,5 @@
 AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad26a9b2150610c3555159854e8b42446f570e33accd26f215b1b5be9b05f7eca1d37b64fb6703a2bfb5 SHA512 9fc219a8096f0aa0182d752fb362796bacd3837b7368e1132c570d28757f316393163088b790b386211cf9a17cf21302cba0812940afd927e0123b10ad2cd23d
 DIST bass-cd-1.2.zip 69377781 SHA256 53209b9400eab6fd7fa71518b2f357c8de75cfeaa5ba57024575ab79cc974593 SHA512 ff896e723b4dbf2cc52851ee1260c1006aa285b768a727974719d63509bdac1c65be9ea565eb037d5e9e1c8fd8fd76a8c04776bcde46616ca9ccce18ea498d64 WHIRLPOOL 61fe423bd4738eaa41a7cbae2dce8408798b9ffd8c8e1ff19164190fb799f999d1d41f549ab52f162bb36d168b5c5b2c54d6d501ae8eb0b76e163b122ae5286b
 DIST bass.png 27613 SHA256 cd27b33772c967bb2c248dcfaa187adc0ee4436d03899c8a57ccc4c6fd92e92c SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e WHIRLPOOL 09e062628507e98e6365615dad4f88d66dfeb8ed6553b2ad0041c9fb7cfa461a7fa8e18f856c9dbd986740824b0016c34eb9dfa0c964dd3a9b5d761e06ea6f16
-EBUILD bass-1.2-r1.ebuild 922 BLAKE2B a8d6cc334a5adb46e6501338ac9cb1232d8c2eeb357295f1e5e2a4eff6c285c732d5a870010ac7e7cf9b06eb1ea81d50eea88edcb697153bdfb75c93453ec6b2 SHA512 1a6ba1401aa1a27d3a366759fa79002be67ead6e25753681a6c563f0a02c7279d29bbcff4689be22545561d798b5563289110d4ceb40b237e5aa4a89c86e03c5
+EBUILD bass-1.2-r1.ebuild 912 BLAKE2B e3991d850f74b94ee4081929135b82bda7489e99d7edb284a06a0c02ddcb5e68d62a55f5710e1fc9706764219a7d1ef27bc5a4e9857c276af869f71dad165b9c SHA512 c00cdeda1e6d9ec76d0e10759a21cac55be9d13a17cc2bbe49db007ddaa232541d6427fd67ae81abad65c91e91e7252c6b3dfb85022fa2125be0fbb6c2d6ce7f
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.2-r1.ebuild b/games-rpg/bass/bass-1.2-r1.ebuild
index b3c31c751f42..6336e5e98a0e 100644
--- a/games-rpg/bass/bass-1.2-r1.ebuild
+++ b/games-rpg/bass/bass-1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="Beneath a Steel Sky: a science fiction thriller set in a bleak vision of the future"
+DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
 #HOMEPAGE="http://www.revgames.com/_display.php?id=16"
 HOMEPAGE="http://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
 SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip
diff --git a/games-rpg/penumbra-collection/Manifest b/games-rpg/penumbra-collection/Manifest
index a3cced6e278c..5c36b148b846 100644
--- a/games-rpg/penumbra-collection/Manifest
+++ b/games-rpg/penumbra-collection/Manifest
@@ -1,3 +1,3 @@
 DIST PenumbraCollection-1.1.sh 949267761 SHA256 e0fdbdbb7e3766629cabd3903675a2f54f1a5206f67d590dd1553576338f3dab SHA512 9e9f604fffd4efd8ab21bdb56fb4f9dbeeee8e5375b83b88a24521a9bbb45ee7060c467aef47f06d551d51a4fdd0a51be5c5416060a87342ea281026ba24c7ae WHIRLPOOL 553034458f2d7e5584ed97ee4111a65cb789854ae1ff9ecb6651d8b66996198d9a869fa7455eaebf18ab1110973734f6f1e977d8187fb9d796407267253552d7
-EBUILD penumbra-collection-1.1.ebuild 5474 BLAKE2B 9494b88e294ee58c5f9eed19ba2f0297db36cd6b2938199cd130f98198516bdbd83f2b55f3e634c55d91f8e5ccc404007f4688b526904c8ada2c56140c84eaaa SHA512 f86a5bb215ca5a3f4382554aefcf399a54f8adba4bad7c3d99eed3df278397ddde8806473cc00f11abf48dda576da269c788e3bb935ddb9e80581ec9ecf87ce9
+EBUILD penumbra-collection-1.1.ebuild 5465 BLAKE2B 9e73dd1b546a234c7d5c598ddf101b42175149671cc5b60c12b3c659ba9f9c71f914765af40f4b310da58a95621c26ee9a430752d232054750bed187053ed223 SHA512 66780e30f29fcdb1a74da672076e4ee2b731dfb5c38ba8b2bfa8aace22761a04242804b7fa819676ceed345c08f936501c8e34fc1272bf5aa9e1b14d103ed57a
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
index d6c6f3aef0a0..ae386d2fefe3 100644
--- a/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
+++ b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
@@ -6,7 +6,7 @@ inherit eutils unpacker gnome2-utils games
 
 MY_PN="PenumbraCollection"
 
-DESCRIPTION="Scary first-person adventure game trilogy which focuses on story, immersion and puzzles"
+DESCRIPTION="Scary first-person adventure trilogy focussing on story, immersion and puzzles"
 HOMEPAGE="http://www.penumbragame.com/"
 SRC_URI="${MY_PN}-${PV}.sh"
 
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
index b6f00bc275f5..bb7608958407 100644
--- a/games-rpg/queen/Manifest
+++ b/games-rpg/queen/Manifest
@@ -6,5 +6,5 @@ DIST FOTAQ_Talkie-1.1.zip 33744817 SHA256 a25cdd5e003a0a5e402af99b218cc7ea81ad03
 DIST cat-queen.png 1099 SHA256 227074e9b259a0c0bb95220d33fed26521433079b988c700db5348003a7c0829 SHA512 009f30e2f9abbc803cd47314d8ff53009898640c12a26cb155b7e0b29c0a2bdaa06cf97fca6ca6f8b428300d63ca8200f627695a3f0b71585374a4a2b63ed2df WHIRLPOOL dde73b1401f746a680fd473a66fd8b1afe3a3d94254e283e560bee6741bf6a8c2be69e5af7752f8de5fdd6e180f24be47256fa29d315864bc68387552a1a5429
 DIST queen-readme.txt 5351 SHA256 815ce5fe1f12f0c92dbe3b08e087e449ea7ed323dd16190c1161d75c7f691a03 SHA512 ed2b5bc18896f9eeadea7526a70ad0a115bda229d1074d8c3a5a64228a7089cc20c6e296d82dc482634ab9bde06a07635d10ee68f47420f00625e0f5c29ef6ad WHIRLPOOL 2ccc64ffebaee9e383c9f461e63bbb1d3c3fe4aca5001e0afd652ae786476b0daebc8fc1bb8d765f0503b7b24568ec5902c080059f1e1d003d771a046d356902
 DIST queen.1.bz2 90404210 SHA256 824e0ac315707bbf8d2c857771268ad961b45ecd3945e32c4706179823deaaf0 SHA512 f931584c141403019dcd91c43c8610c23cf39b37272440517c75cd4946da005d7fabcdd76fce2ec7504f35ec02727bede7d6a98381bd4f0c6a8d65b3c4363278 WHIRLPOOL df0d9fbedb98527e9a997431528150cbaedfc2c5d452aa144b783d7b8ad6508b801dbaa03f93a4d1eddc10f03340f6059b3c5e0254be98dd09b7abe4f59c6d1a
-EBUILD queen-1.ebuild 3433 BLAKE2B 1d9fb8ca69b10da22d427df7f75b67c4e23d4110be4c85bb29968d3eadfd812d69570c6a7c4da7804a2d0bf6770b1ef1ff10f7d0e77f2f26a190e18160b0e270 SHA512 4a1a58bd83819d3dadcdb50fd71d277b5723f8dffa0710ffb425de68e45a9ed231709f45c75e7408f005635ba2034007358de1133c0f2fbe6412a1ca73e1a596
+EBUILD queen-1.ebuild 3431 BLAKE2B 9c7a7e082976d42406b3b54a8113b25bab3095afb16e6b78f22bb324be3fd9f2a0ed66567a95e0c2fa7703239ba947b338019bcc0f4183501be9f9bf92717f43 SHA512 22694eb9ab12d88a509596b679d77094b204db010882306b21f77aacc9f690f9f0503429f73757df0234bd2cfa82f042e0a5cb58fc713c8bacc4f52748b40386
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/queen/queen-1.ebuild b/games-rpg/queen/queen-1.ebuild
index 2452604f87fd..19c0b02dd67c 100644
--- a/games-rpg/queen/queen-1.ebuild
+++ b/games-rpg/queen/queen-1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils games
 
-DESCRIPTION="Flight of the Amazon Queen - a 2D point-and-click adventure game set in the 1940s"
+DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s"
 HOMEPAGE="http://scummvm.sourceforge.net/"
 SF_BASE_URL="mirror://sourceforge/scummvm/"
 LYS_BASE_URL="http://www.lysator.liu.se/~zino/scummvm/queen/"
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
index bef980e30dbb..2361b6b832c9 100644
--- a/games-rpg/to-the-moon/Manifest
+++ b/games-rpg/to-the-moon/Manifest
@@ -1,3 +1,3 @@
 DIST ToTheMoon_linux_1389114090.sh 75823678 SHA256 8272e4693dcf553f4285de4c46e89e1e2e4d5a59a088396b7ea188f935407970 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a WHIRLPOOL a3ebaed2e50636d2692ba1b893001cdb327c650d2b5336e928c6f6b74d3a382ed1c392b748e61d7037aa08f4029a524b5b83933f77da57177a9e1bc968385087
-EBUILD to-the-moon-0.ebuild 2513 BLAKE2B 24779d989ee64cef7aa676132ad24eb4a3044a70c63b7a7f1e0729646a4fa4ab76a2d33c61b87d2a81891334fcb3847ec6360926cf3c3dc4e18c6d246a68c299 SHA512 7ad1d08d751b2cfe841a7de31970605694a44092cd06791e7249736becd0b6ca632ce0af9ee85032da830b84562df14ae6fb1587d2d650acfe23fb1d3a183608
+EBUILD to-the-moon-0.ebuild 2492 BLAKE2B bc3017c2c0e28f78d084a6bbea466ceb3e3411db3a0b5134a8e4bccdc5acfcd7fc00b80e5db0083fdc60320d1c7b75a09968bb3e2e68febbdafa72a147f47883 SHA512 940033be5a9114f29d9e0f8f6dca75e9b68b3d5a0980710a02159cc66ab1f01fab2e208223a3492ed70103052680b86c52dfbc88ef5409d654b512f1f0e475ce
 MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0.ebuild
index 1dd770bbee38..7560ad283a8c 100644
--- a/games-rpg/to-the-moon/to-the-moon-0.ebuild
+++ b/games-rpg/to-the-moon/to-the-moon-0.ebuild
@@ -8,7 +8,7 @@ EAPI=5
 inherit eutils unpacker gnome2-utils games
 
 MY_PN=ToTheMoon
-DESCRIPTION="Indie Adventure RPG, two doctors traversing the memories of a dying man to fulfill his last wish"
+DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
 HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
 SRC_URI="${MY_PN}_linux_1389114090.sh"
 
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index 4140f573d40e..f2e23cdde66c 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1,3 +1,3 @@
 DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 SHA256 0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929 WHIRLPOOL d53f4636606c03a5977b9603495f61aaedc3f1851a1ca2bd8b4b2bda6feff8de0f9ec488fa10b052870fbfbea875673f2fe27fafd92ee0c663b0ae158171c2ee
-EBUILD wasteland2-1.9.0.13.ebuild 2097 BLAKE2B 3245cc706a2f97c96f5457d4632d24580db03f35911fe44e9321f6bdbaa74679e93685860f17778e11cc3b109bda0c3aeac092af33d3b1a309f1fdacca4a19e0 SHA512 c9d1a13ba2603f8961bd23934c17551ee7a257ab1caae0cf168f6079ff651a8ada2f9e4a5a588862ebd4d07a790f8493b39af9b7578c1bd9224b5e99a7a97633
+EBUILD wasteland2-1.9.0.13.ebuild 2051 BLAKE2B a8762193eec699034a3bbfef566c23c81b638730d02ec1409565d5c85a7f866df3817a9ba270bdac5b45614ce5825906d7696eabe9588afdb30caf2f170c7ea5 SHA512 158bfcb7eaeb02efbb2fac3a31f25d2f1b1f221de81f62252a00f33b1b7a5569cfe320a9c7622fb72d20987b81c2b1d9a02a16ec8ad4e50bc8588b4e5f6e7166
 MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
index 30b318d91a41..c457367707b7 100644
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
+++ b/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils gnome2-utils check-reqs games
 
-DESCRIPTION="Direct sequel to 1988's Wasteland, the first-ever post-apocalyptic computer RPG and the inspiration behind the Fallout series"
+DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
 HOMEPAGE="https://wasteland.inxile-entertainment.com/"
 SRC_URI="gog_wasteland_2_${PV}.tar.gz"
 
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index d8289f9cc61d..d16a62d7dc9b 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index d6ab2e9b0ba9..a511ca490a95 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,5 +1,5 @@
 DIST endgame-singularity-music-006.zip 28250705 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f SHA512 47e489112309cc742c2dcffec004aff25c54488fdf2a5f2dc67b7dcf67ca55996fe8e8403e4a16712fbc4e22289f12e612ad9d4322cd1d1aaab871f0ffb27e19 WHIRLPOOL bb94d4a5c50ef9fdc55e1384132c3ebb8788aa3746b70f8440b1855598682f7d6c99fb058d398012ca0b8bbe47d9b1362e070c3815ec96c05c9c9a66469da4bf
 DIST singularity-0.30c-src.tar.gz 2265133 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f SHA512 ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f WHIRLPOOL f7b95b170df3aa5bd5080f1d7480b655fb63bb513a9b16b5e5d9873779bf478d8c19e537c1274bbdbd04cc688c1c9ce3ba1507c28a503904703afff678a0bf0b
-EBUILD singularity-0.30c-r1.ebuild 1283 BLAKE2B 86d4128fe33a0f9bf81d4b72202e3a901f5b7011a38696eca9a50f13002c584eea4483b5c615336d22ae3a841f4c69da42768997a6cede465b09f37d10d9033c SHA512 1883929da46e941eded443e96c35804e12f657e284c42670082f0c21bb920fa37a617ea5bf12e6b5ab9573f2cd18e0334c0dfc74a267f9010447219b4f8bd812
-EBUILD singularity-0.30c-r2.ebuild 1225 BLAKE2B c6ef94dcbb53f097e2e2503a1fafcd603700ba153c7a91dc915bd9ae1cebd91bddf2b6bb0a884a9481f5af6bc119550217c6dcd28e3a2f0c837a551d54e41333 SHA512 375a554d84fa8149a27757fb24d310baadc4c1a2af25d01829001d95723cba1e1fd555418f4dad379ff0c48491f891764e7e48e7e2e73da42ff7d921a72d4b8d
+EBUILD singularity-0.30c-r1.ebuild 1279 BLAKE2B 4bc443b77435fb1f34a33e6b3b62e91f6c961eca0d419de6b57d2dad858a3c006fc19fbd1535c7edf5c20bdaa66f368095b1b3149e93c0648d569e633ec7397a SHA512 71fc94edf3369e49374395bdffa6df569f31fd014817ebea5265d26342147bb6a0ea23fa1d26f32ea0e1943ac0a85942ddc8a6d5b0118d1f521ee3d2340cc3b0
+EBUILD singularity-0.30c-r2.ebuild 1221 BLAKE2B 308560485eaad449831520685a57dddceeea6ea08905ebfdfc3a101eac98e081646d9f7c86a117e59c21271d65338e9c13c31ce6df05c238cebf88a038291e43 SHA512 4ee050a90784b2241fd09a07c09c4ea755c53cf1558041e694cf89dc74080ca28686d075bbba0168f04db0b2432a4d29157566a00106ab6e0bd9ad4b39498442
 MISC metadata.xml 405 BLAKE2B 5ce059ade56e4080d77172d347c4f22a80c7d0762df1ddb9833fc92455b0bc22aca2263eb217b15ea82f76bfe268d9d1793b169774f2150888652d8aec83a745 SHA512 c32086dbbfce16439635063e3ed94a44a9bff47f5047cc9c078ed59bf4eac0e7e91b86037f4fd19c1e21fdcb4853e794535cc4d1a8ee898f8e292b26bbe7883f
diff --git a/games-simulation/singularity/singularity-0.30c-r1.ebuild b/games-simulation/singularity/singularity-0.30c-r1.ebuild
index 74baaef27626..1c03544f34ae 100644
--- a/games-simulation/singularity/singularity-0.30c-r1.ebuild
+++ b/games-simulation/singularity/singularity-0.30c-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1 games
 
 MUSIC=endgame-${PN}-music-006
-DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
+DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
 HOMEPAGE="http://www.emhsoft.com/singularity/"
 SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
 	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
diff --git a/games-simulation/singularity/singularity-0.30c-r2.ebuild b/games-simulation/singularity/singularity-0.30c-r2.ebuild
index 69f55f32b106..51ceaa93529d 100644
--- a/games-simulation/singularity/singularity-0.30c-r2.ebuild
+++ b/games-simulation/singularity/singularity-0.30c-r2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1
 
 MUSIC=endgame-${PN}-music-006
-DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
+DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
 HOMEPAGE="http://www.emhsoft.com/singularity/"
 SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
 	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 1f59481ad211..a4f84ac57a0a 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
index 9c7ca6817f06..3dc23ec62f83 100644
--- a/games-strategy/heroes3/Manifest
+++ b/games-strategy/heroes3/Manifest
@@ -1,5 +1,5 @@
 AUX heroes3-wrapper.sh 195 BLAKE2B 8c588f523487201cc7323f49e0912c32dee2699d04ed4ac9bea55aa588918fc797c93d2fbeb04aa5a726ebce01e0862d5e21a80d477f1e32f535f5c5c9d771ef SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8
 DIST heroes3-1.3.1a-cdrom-x86.run 3012188 SHA256 f87d78e09278e2f05cb15e2f79dfeaae2cef8fb147b83185dd4f818c0ab7759e SHA512 d0cb902386361b17009aece0d0508a0c19683c71acf3abe11a7f50ec2d4710a89cda3f5f9da326b58e9b945da5f62533dea54457e141ce71ebc3e9945dca814d WHIRLPOOL 3f58f6c6a06b2cf5b6e0b090bf4e481428854ee5263391ee85b9c7f1dcfe026a0f5b07f1f4d2c636024370e3c304a488f0fdfd6a6148ad89b40c1e7a42cc10d5
 DIST heroes3-1.3.1a-ppc.run 2643068 SHA256 b14eeb8eef705b20dbf54eb308b2232d6110f4ec568cb82d9ea9fb7f9cca3137 SHA512 3578dbed0ed9fd47f67e6abaec4b4d66628160509e68dc3bea7b5288230e344b5b8f9d380c6a35ffc9d084d0e2a54ce84df72b13bfb609fa4d7edd1456264276 WHIRLPOOL a073ddbb8f871219ea605946cc1ec16e07c888ed0ebb174c59df8e402439db61dbe2c4164e929e7e8b0becb09083078ebfb62e0ec30b88dc5007326cbf687509
-EBUILD heroes3-1.3.1a-r2.ebuild 5512 BLAKE2B 51a3e63b5440b99b0f88b3b3b53e5d8a29cda0c367b85c0728cbf6d09b14b0944c8b4785f118546c80aa4903bad4753f1c904652c0d535a826275d7d304323fe SHA512 f32f832307e6cffff37705dfae830bb34522e4fad93e97a7d72b64f3a506615a63e934319e5d688475b8d59e39e9b68c6db6fb18954116172f20e2cc6a0a9ae6
+EBUILD heroes3-1.3.1a-r2.ebuild 5478 BLAKE2B 6b13ab2a5bf911b39b36d73cdb702f6f643cdb993ed9a2130799eb8f16427b54dbb66bedbc1fba5b8ebc85c7bc4213b0fd2bb6f59b6adb6804dc8013325372c0 SHA512 56678d9f57e964d89f93fa61a11c2cb3c2b476bbe982a1b861b01859655de51a579e34114b210d2fba412506ffe2db3693a035b854acd0e7e4ba1142596595c9
 MISC metadata.xml 451 BLAKE2B ea23bfe60a36d79f73d5ec04c4b58fe66241baff684458e6121f0f247ee8516767f372551e8b17933cbdb4271d3e99f6028c9a99136daa6e8b558e7a918acf2a SHA512 d4b4f5dd75aec49703e77221d3811c20f72405f45f5ac7990e46a8cf8d639f3c53c5bfae13e6615c0a0ac16ee57073c8e92de355f7e1ac934d9be6b90bce6990
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
index 29250b27a1f9..a08da4b3256a 100644
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
@@ -18,7 +18,7 @@ LANGPACKVERSION=1.0.4
 
 inherit eutils unpacker cdrom games
 
-DESCRIPTION="Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat"
+DESCRIPTION="Heroes of Might and Magic III: The Restoration of Erathia"
 HOMEPAGE="http://www.lokigames.com/products/heroes3/"
 
 # Since I do not have a PPC machine to test with, I will leave the PPC stuff in
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 7647d92e7802..356d60606c89 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index b8fc4b4390ce..ca4cb95c7294 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,3 +1,4 @@
-DIST pimcommon-17.08.3.tar.xz 275848 SHA256 19e574432006f334fb7a9fe2154ca23ccc73abc672798de8966ea25361db2a34 SHA512 f5de67a51ce69332e0d61c10d2baa97cd8b5128d4f4e48b0503191b9cab283fcf32b4e205be2ce360acb3a523cdfd6ae416264b718c633ef6a1603a939c55bd1 WHIRLPOOL 16e16a330e6f069442ebea8b86fcf77815a12c9939e47273fa0d89dbc98d955279c2509fd091a2c1952e2bed8e3e6c7deb4a8ebc8e3b1ec3647e8ba024165054
+AUX pimcommon-17.04.3-deps.patch 2275 BLAKE2B e7fae2bb57f660c853e5e3c6e37a0ccabeea2676c16e16822d40eb9d3b3a2581c8d5bd5464ab55bcad95b4b1e5bb00313a3c6b7ad68694b2bf17cec1bec89c27 SHA512 8e123d9e5e952503120b329d7f94e7fd09dd364eb3871580cb2d8c444626daff2a538a07577b90ba40ca7ee9204344614392ea76df4c92dea1a4daf39b3ac8ec
+DIST pimcommon-17.08.3.tar.xz 275848 BLAKE2B 9b0d60f9dcc427d7e83b39bc36204406fd0b5b6abf32c24364bb2e8f7a3b3bee7442eb8ae324bcd4f150249783daa44b79b40811396558029436978793c74c5c SHA512 f5de67a51ce69332e0d61c10d2baa97cd8b5128d4f4e48b0503191b9cab283fcf32b4e205be2ce360acb3a523cdfd6ae416264b718c633ef6a1603a939c55bd1
 EBUILD pimcommon-17.08.3.ebuild 1413 BLAKE2B 1ded71ba7b1a4e22a9a94325f70a2fce81012113b1d3c2828edc3d7d575ff7d4673bc75913723600147579b151121ac16e6ba5c31b1d0a59cc41f336b4e6e054 SHA512 d63ca2120c97d9df881a04ab8a9360aab220808f3c639ea101657b66065f71e3af009f8a44f6beb379ade2d4ace87d1e333a605e8618930b4ba1e0d871294ecd
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
new file mode 100644
index 000000000000..9e9b37b4f399
--- /dev/null
+++ b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch
@@ -0,0 +1,54 @@
+commit fbebfbe29d1928a36fe5643853b5a02f13f7b07c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Jul 23 22:21:38 2017 +0200
+
+    Cleanup unused dependencies
+    
+    Test Plan: Builds fine.
+    
+    Reviewers: #kde_pim, mlaurent
+    
+    Reviewed By: #kde_pim, mlaurent
+    
+    Subscribers: mlaurent
+    
+    Tags: #kde_pim
+    
+    Differential Revision: https://phabricator.kde.org/D6859
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dca7fe2..d5f41fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,23 +47,18 @@ find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
+ find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
+ 
+ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+ find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
+-find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
+ find_package(Grantlee5 "5.1" CONFIG REQUIRED)
+ 
+@@ -82,6 +76,7 @@ find_package(Xsltproc)
+ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.")
+ 
+ if(BUILD_TESTING)
++   find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
+    add_definitions(-DBUILD_TESTING)
+ endif(BUILD_TESTING)
+ 
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index cae2c52c5170..d6ec5651ce4d 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7bb2fe4e0e4b..971b562e7006 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -28,6 +28,6 @@ DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f811
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.89-r1.ebuild 12241 BLAKE2B bd193a4137fdc6be1615fe85d60b0c4aad676b2158b47592a20545f068292b1b92f71ac36b22da24b0aae6ed1cc12b701fd5d72bb7d3adec8c995730e0da83b3 SHA512 7ff6fa9d2b968a65e4b1e014f4bc1c53d7d1282a45893132aafdbceb403172a02c1455242a266960b4d403db3ca981fffaa8cc82028964e2c72dac8a0da347dc
 EBUILD exim-4.89-r3.ebuild 12401 BLAKE2B 40e24ad653011522ff3d42b2fac04be3a603ebe106d980ae64640fff8399a62df1503826fad1bc80a1f2bbd6eed8e08492c9bd49dfb461967ca408f68ed19a50 SHA512 4a529526216963f566d5c30ecdfadbfdbeac276d8187b90b8e6aa6be17b6bffda64ae66e9ae7b77ada193812125669d72a524fd9095af58ee2561cfd7df0d76a
-EBUILD exim-4.89-r5.ebuild 12545 BLAKE2B 325558337027f91801f6239edaf331b8d833a962cbe2f1a2b3b2ce1fc0d4254a0c7ffb7f5d91ae329efda1c85bbf4fbb6ed47ec152d0999e625a83450bc92865 SHA512 9e5aaf8402acb2cb336069b49cbc515434f44cdc1f221608de5499797f9deb749498e33aef549ba6861809446ae9a547930d3ffd78899b83f5902ddb31b88932
+EBUILD exim-4.89-r5.ebuild 12544 BLAKE2B d7eeac8177ebce7364facb549e5ff9201cd2e4ee8db1657a8983c841848a2538e25dbc7332348301db0efa6164aac20edf2214cfb99809c80aeb198254b8a126 SHA512 17349f3ee92aff0ff43ac13911c0d6a5004f3c8a63dea19b5c3ded6a08c52f8aa219f6a6a559ded9c2b0da8c5cb803e2688f6b0938a1f2a9c732ebf57b2985d5
 EBUILD exim-4.89.1.ebuild 12267 BLAKE2B 885d2f6d47f2d24ae64ddd81dca542489d8da050b7ca4cc5a66cfb449fd8aaa77a4a37cf6aaa1e826e2c2f750baa28bef256d37a9e18c88f5887b123d0a26f5d SHA512 e7e55e2781974982ba1ba5de76210bebb806853ca0ccc6f6fd82b3574964b099ee066c34a499edbfeca62ee258d4b7f813f6d583d6c542650a8c94286e628233
 MISC metadata.xml 2482 BLAKE2B 8cc92e47224d8afbc72bd61d6651887f5211c4ebe36ae1d38e55ed395dee9574307b075bcf36fcd0761be0358c2bc27cfc0e60294a48483b444d4534f5c0b9da SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f
diff --git a/mail-mta/exim/exim-4.89-r5.ebuild b/mail-mta/exim/exim-4.89-r5.ebuild
index de57ae11836a..696c16c8b2c0 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 582eccd23496..37e8659306cb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 4cf521f2aa1f..3d0a2e1330fc 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -3,6 +3,6 @@ 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 BLAKE2B ea3d74963b8788433c822db1e574cbd363fea48e80962d888802abc7af8a52fbb5e4f8448b56afe81d8786196e55776ae68532e6f1badf439319433c540985b0 SHA512 ab8f7fe7707aa90a72b362072dd4096a737811bf5da492cff71211df6006fab80d88a3d0a759e91a3dc7669a1af80e8aaeb27017adb9818a3b309b45a046205f
 EBUILD libkate-0.4.1-r1.ebuild 1170 BLAKE2B e291fb9f87220b55cf9ebae392448fad956dabc1872b3a99fa4bd68dd373065f0d92422c5a7eddb62ae19131a15de1d1786dbcbee7b38968a9f4c9f9a16ac36c SHA512 8a9cc877df61e2dca2425ebb7cc3f63cf15e95a55fc4bb9c0cea0357aca911f3d2f86dbd2a0b0cc2cd8a5b974b347484d71c2b34c5cbc38f6b8562bcf2c3bb6f
-EBUILD libkate-0.4.1-r2.ebuild 1166 BLAKE2B 45794311c742b7d773afaaa77748717925d0cd1da67b490700b30b26e3dba112049a600b0d104710339db6a51aee6ba1f0559962cfb7a454662deea20d77c644 SHA512 ab2cfef533f850f2c2ae22ce75ac7ecd4eecfe64bfa534881aa66badfd2d4a92fb9802cfdf836b3a6ae773f3b13f42b63aded283c76ee0776a158837206afae2
+EBUILD libkate-0.4.1-r2.ebuild 1165 BLAKE2B 3c5259f37c8097d89c3f6ea587df4e1f7f7bd70f6a5aadc09bf0b15bcf35049f1bec2f23776083ee736f486a2276b89ea2378116c74fec882d877b04fe53dc67 SHA512 31ae83ab786074eef00e6967a71fe2c8f5c03efb6cfce084ef3ea55392a969e6bcbe4e93bb8d94da3f468bc193c787f98d6ea4016c0d30f5c40e53ff8c3d5e98
 EBUILD libkate-0.4.1-r3.ebuild 1318 BLAKE2B a1e66db77b3f10d5ef7af43bf2fcb7f30c2f00f617777bf49d9b565ca3233ad36e7bc966f7a82182546636328550277927d05e912793ef5fbe03bcc3cf24160f SHA512 692ef685b3bb8a6b8f7cab63f9884407322d608c8705611cbc6298b2b94f0b4b4850a3a7d828256472da32247a7685c957fe414e7b7c46ef152139e58e779237
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r2.ebuild b/media-libs/libkate/libkate-0.4.1-r2.ebuild
index 035f70aa8eab..19f3e7378f4c 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-sound/Manifest.gz b/media-sound/Manifest.gz
index c7920d5c8d4c..bdf4a85c4c8e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 4a7d501ab757..af95928d8259 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -4,8 +4,10 @@ DIST grip-3.3.1.tar.gz 812562 SHA256 d46394a1062ed066f9c633b010fd1059e63d9ed791b
 DIST grip-3.4.3.tar.gz 740870 SHA256 34b7dd9f8c904f8f1984f691b3bfc62a68979eef62ab4e638817afedcc2fde0c SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361 WHIRLPOOL fe1465d60cb850e0eb9bfdafe288ee66e8527b9ad41e2cf4d4dfda21a972d9bd9f1fd69d23cb8d3873109a805c4dc9d571f68e8a7f9edfd97acdb7f2837cc1bf
 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
+DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
 EBUILD grip-3.3.1-r3.ebuild 1353 BLAKE2B b7b3afd31cfe23537df761d566b221f3f762ff807d5d3fa87b2b4524d15eaa7828d30ee5e80fd14f3e63d719ab777c50241013a6f5423c6b3e578cdc1f237ef7 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154
-EBUILD grip-3.4.3.ebuild 1209 BLAKE2B 838d7d0df0bd5f87b24cbb1cf6733021e7ca25a06bbd618e29aebe49034378e9d6bb8aca344e29006e153806afda55269be073007c4b27a19289f59e56076e05 SHA512 12232d370cc9d4951ebada3270210512fdc2e5849e16b94aeb2330bfee8bd0cd87d550fbabefc346fb2430b80f4172fc8f16ecb6962665af3f95df854b1231aa
+EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e
 EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 EBUILD grip-3.6.1.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
+EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
index 3490727172cc..42a84e6794cf 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/grip/grip-3.6.2.ebuild b/media-sound/grip/grip-3.6.2.ebuild
new file mode 100644
index 000000000000..5f7555472651
--- /dev/null
+++ b/media-sound/grip/grip-3.6.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+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 )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index 051c37cedc9c..eb172b44bd71 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,3 +1,3 @@
-DIST shntool-3.0.10.tar.gz 216061 SHA256 74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d WHIRLPOOL fb7c11c99482e043da2827ab682aadde4b7309d5e0739a176589de2ac8db0af01d62826eb8d8c6451c2c72876078f4147fa8712ce41acff785ac495350d17322
-EBUILD shntool-3.0.10-r1.ebuild 704 BLAKE2B 117107b3c2dc7f2149e087c6f1c2b668975d624c0b9cb0580591d2b257dddab5997ed905826266e29eb397ee455265edb6b2fb8ae38cd8ca899caf670de18323 SHA512 74bacf40ffaf19f1bf4d9ff2762dfc8ccf8fec613e59d95d229e93fded3d41faf0ca7d5c39984befb11f8fc6af06b5eacfddf194abaec82a6e7799b56fa97054
+DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d
+EBUILD shntool-3.0.10-r1.ebuild 778 BLAKE2B 8dd9c0a67bc2fa0f5ff32d995f169abf6720d63dec8feb7fcd5556de0f6faba3935c789db74302d480b0c93846070784bf7483c315f60b1943a92148afb93253 SHA512 13ee328557b2f40c6177cf8b230eb55a3335b59102df8238490e6fd98d3d72a9c0779a4024bdd7d68743b28ab21e8a8ac47f37e5e40d0668a4c999298c338c16
 MISC metadata.xml 419 BLAKE2B ee01913318798b80d3bfd0b80eafaa243251f697b067105b204b2bd07a67ff27c81e1a0a2a7f53796495699cbd4b0335e263e1782b8fdc43acf19c9f16495c01 SHA512 6776c4523ec29fd9704ad9ae663d099d51eda469b2fe063bafa8c9a1f37da3ffe62f1e7f506534d28131db2fe0db98d815d81d8d0840e685a6f07449aecf65dc
diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r1.ebuild
index 16c9434f3ea4..69859ce07241 100644
--- a/media-sound/shntool/shntool-3.0.10-r1.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -21,3 +21,8 @@ RDEPEND="flac? ( media-libs/flac )
 DEPEND="${RDEPEND}"
 
 DOCS="NEWS README ChangeLog AUTHORS doc/*"
+
+src_configure() {
+	export CONFIG_SHELL=${BASH}  # bug #527310
+	default
+}
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index fc6332431d71..006542474110 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,4 +1,4 @@
 AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
 DIST soundkonverter-3.0.1.tar.gz 821278 SHA256 92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911 WHIRLPOOL 2dfe82c4400c0afd05dced2fb5b92f2f239a456ee87ebe6d3eb10c2474f70121d0d72700ee3fdbe2b31ea7f1a3d5fc78e65af0f89bb73c291467b5e698053e5c
-EBUILD soundkonverter-3.0.1.ebuild 1457 BLAKE2B 54a71f84beb8092dc2f6daae93836541db2ebe3ce1e349a1ed213a21bc0e406e66a6a7e0fadab89d5ca7cd8675977031bca2aa46274576b0a81689582e562de2 SHA512 2aed2d8a11551ada66308b0ee9670331563bfd105047aefd643416812c4b2c2f1aa24f24cf9c93548f07bfc93f7344a3739c9d603656fed62e2bf6ab6dab64de
+EBUILD soundkonverter-3.0.1.ebuild 1528 BLAKE2B 5c3dbae02d1c66bbcf2e680824a8675a93a1f5851ea295fdd41389319c2534342d9e594f5a000124baa625a0bea2957271a1a200d5f13b98a9c30d944162b22e SHA512 d195fa425ec96a3d47f1ab877528808efb4a33c07734679b6b1d3797c8e6eca3b7181285bc7eaec5c73b298e102a4b4863a182d1d861fa01f1be20f770ae4afb
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
index 6da7c224a693..a3fc60e418b0 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,9 +36,12 @@ RDEPEND="
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/soundkonverter:4
+"
 
 PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ab7b9cbd029e..721311388d61 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dbb105b28804..f0111f5bf764 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 02:08:24 +0000
+Fri, 01 Dec 2017 23:08:31 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index a9052856e0c3..3abc8e3c5746 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 412220 BLAKE2B 617f98a11422c1ee21088130d37b0366715c394e1b07542c78cc30517f3787d1a7caef3c41d798a3b476df30c0c66c05c78794ebc80ff83c5b528cbc6cfe4b21 SHA512 cd79d1d0f667c0328946b3f39635013f95ead0bdc9d55e949bdeff00c6846b73b692fe2e0db699410d94aec83dcc49b2344f458738ab9321428be107da1bc56a
-TIMESTAMP 2017-12-01T02:08:28Z
+TIMESTAMP 2017-12-01T23:08:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloguZxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloh4PNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDmbA/9Ea9hyShwf0c+2RsyOjq+dH1pfUKSrNf2ref0m9eZoDqTLaDVqhTTwycq
-VKyHPT5ZxTCkI7PAdy4uEiWoksLGyHdrO7uFJSO5mwOgs/wohseaitPmkThW0rMQ
-biSeaiDcrX/lEVQAkZpgixjG7auUIdxGOe0RoKJYeffqM17A46CJ2/rCHNd4VyJ3
-FqIQzlP3it77T2xXxQ8FOtnAOReES53IswzqbWgSwdIFFN9YaFMLLP7O0w5pF3TX
-EOw5cNERf3YRcKPqGZg/V3aZHn1oNQEO3ox0mUsEGDg/s5zPWXSNV5DjqEBnAMEG
-mOZrCJYqbrC1rqFErw82qFukrFyaPzN2GRjMMPOfaOaSziVjA6llXr5eKOWoSwOQ
-vQrQQEz5bXaFfppLfiPpn0sCRew/NUNkR/Amh/Ux64DJFfzUsr5WWdZ3BmBmG1uG
-rmW7WvsqWerFcCUvLUiS+1b85v8+IY99CKS75UE/vk+HleL8wNGMa5mvk0j19BRV
-gLYYFV+2vuJOSqCDDWfsVqI1rAVGV3xNrdIdPJaw+NczvQGEZHj4wqqjnFhreBVi
-RoZ4UYIoYYmpupb4BWMd8YAZp4HKnjU9cGMVPT6BXCar+tqdcyicVhagYRJ1aNFo
-H3Kez64vUiiCsZMjePsp4QqREQbAs1ON31j4HZ7kGg5ENME2G0g=
-=W3LS
+klCy+RAAh7bVFWeYn+5MKkL+mZVNeibZ2hpXGES3vcygpHjGCTg1s7j9Mk8VxAwg
+H2m1rvErC4ktQWwHgpLeguAhiUMYJya+ihNzwgxTVQZZGfKNpgUPRVRw8wcqny7G
+f90dL0tEzjsM0gLFBoJMSvw4aFAAXTTwXRmOjR3hl/I4IOVgf64Fa5dqpPJChFPr
+3No9tFwFUU4a43XI/yPfBEpXJNfoxALe5U+Jb7TUSVfOexNS4TBDxuozrIAbUuwX
+dKWpPCY+fuJbokGlbLGIC0eUVXIXiIZpzymufQRrbnItXMt6wcqqkOr7COmHNaJg
+ta1Wk5k12XrqZiZshMt/eTBuHA7/hiVJeTmrTAKa6MxUpw3ZdmSeMdMC39TyWnJp
+8OsJDvLLn39PVykuanxGsLWQUwXm8GCsEoGgYvK0YGLTdsEIrwPpYJeX0zA/5BoJ
+vdBY7cGWbOYv9US4UNI/AsUoz9FUKCB0Nf0Vb1/Z7lJA8z0yqhzGa44rKlQamo8V
+5LoM0JOBLuNtQyisPdUC4rMkqP5VfLi1KUrdWuURCOs669c3sezYrAemMj8HOK6g
+CnFJv3JYYGbw3EQD7sP7yIObGMS4bxay4GmVc4Fn8TIUJGKNACmqXz+j5enmTJlr
+qIsWVlfWZDaC685piWNXKxn5KO03N/ukscj2W1VsiVJuu7RkGgc=
+=qUus
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index dbb105b28804..0c2d29625061 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 02:08:24 +0000
+Fri, 01 Dec 2017 23:08:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7507a075b3ab..93dc8bf7db5c 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 08f7f63e113f..972364127f02 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/dxf-7.0.1 b/metadata/md5-cache/app-admin/dxf-7.0.1
new file mode 100644
index 000000000000..daba76217bed
--- /dev/null
+++ b/metadata/md5-cache/app-admin/dxf-7.0.1
@@ -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/v7.0.1.tar.gz -> dxf-7.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_=4251ba489a3b2dc17002705967e3e0ed
diff --git a/metadata/md5-cache/app-admin/helm-2.7.2 b/metadata/md5-cache/app-admin/helm-2.7.2
new file mode 100644
index 000000000000..a5e9260def37
--- /dev/null
+++ b/metadata/md5-cache/app-admin/helm-2.7.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare test unpack
+DEPEND=>=dev-lang/go-1.8
+DESCRIPTION=Kubernetes Package Manager
+EAPI=6
+HOMEPAGE=https://github.com/kubernetes/helm https://helm.sh
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/helm/archive/v2.7.2.tar.gz -> helm-2.7.2.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/aokoli/goutils/archive/9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz -> github.com-aokoli-goutils-9c37978a95bd5c709a15883b6242714ea6709e64.tar.gz https://github.com/asaskevich/govalidator/archive/7664702784775e51966f0885f5cd27435916517b.tar.gz -> github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/BurntSushi/toml/archive/b26d9c308763d68093482582cea63d69be07a0f0.tar.gz -> github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz https://github.com/chai2010/gettext-go/archive/bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz -> github.com-chai2010-gettext-go-bf70f2a70fb1b1f36d90d671a72795984eab0fcb.tar.gz https://github.com/cpuguy83/go-md2man/archive/71acacd42f85e5e82f70a55327789582a5200a90.tar.gz -> github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz -> github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz -> github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/emicklei/go-restful/archive/ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz -> github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/evanphx/json-patch/archive/944e07253867aacae43c04b2e6a239005443f33a.tar.gz -> github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz https://github.com/exponent-io/jsonpath/archive/d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz -> github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz https://github.com/fatih/camelcase/archive/f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz -> github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz https://github.com/ghodss/yaml/archive/73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz -> github.com-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/gogo/protobuf/archive/c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz -> github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gosuri/uitable/archive/36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz -> github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/grpc-ecosystem/go-grpc-prometheus/archive/0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz -> github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/huandu/xstrings/archive/3959339b333561bf62a38b424fd41517c2c90f40.tar.gz -> github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/inconshreveable/mousetrap/archive/76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz -> github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/Masterminds/semver/archive/517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz -> github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz https://github.com/Masterminds/sprig/archive/efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz -> github.com-Masterminds-sprig-efda631a76d70875162cdc25ffa0d0164bf69758.tar.gz https://github.com/Masterminds/vcs/archive/3084677c2c188840777bff30054f2b553729d329.tar.gz -> github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz https://github.com/mattn/go-runewidth/archive/d6bea18f789704b5f83375793155289da36a3c7f.tar.gz -> github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/opencontainers/image-spec/archive/372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz -> github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/russross/blackfriday/archive/300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz -> github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz -> github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz https://github.com/spf13/cobra/archive/f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz -> github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/technosophos/moniker/archive/ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz -> github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/golang/crypto/archive/81e90905daefcd6fd217b62423c0908922eadb30.tar.gz -> github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz https://github.com/golang/net/archive/1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz -> github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/43eea11bc92608addb41b8a406b0407495c106f6.tar.gz -> github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz https://github.com/golang/text/archive/b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz -> github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz https://github.com/golang/appengine/archive/12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz -> github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz -> github.com-grpc-grpc-go-8050b9cbc271307e5a716a9d782803d09b0d6f2d.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz -> github.com-kubernetes-api-cadaf100c0a3dd6b254f320d6d651df079ec8e0a.tar.gz https://github.com/kubernetes/apiextensions-apiserver/archive/a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz -> github.com-kubernetes-apiextensions-apiserver-a5bbfd114a9b122acd741c61d88c84812375d9e1.tar.gz https://github.com/kubernetes/apimachinery/archive/3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz -> github.com-kubernetes-apimachinery-3b05bbfa0a45413bfa184edbf9af617e277962fb.tar.gz https://github.com/kubernetes/apiserver/archive/c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz -> github.com-kubernetes-apiserver-c1e53d745d0fe45bf7d5d44697e6eface25fceca.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/868f2f29720b192240e18284659231b440f9cda5.tar.gz -> github.com-kubernetes-kube-openapi-868f2f29720b192240e18284659231b440f9cda5.tar.gz https://github.com/kubernetes/kubernetes/archive/0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz -> github.com-kubernetes-kubernetes-0b9efaeb34a2fc51ff8e4d34ad9bc6375459c4a4.tar.gz https://github.com/kubernetes/metrics/archive/8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz -> github.com-kubernetes-metrics-8efbc8e22d00b9c600afec5f1c14073fd2412fce.tar.gz https://github.com/kubernetes/utils/archive/9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz -> github.com-kubernetes-utils-9fdc871a36f37980dd85f96d576b20d564cc0784.tar.gz https://github.com/fvbommel/util/archive/db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz -> github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=676bd7af25730bb45b4ba3d46f6ca919
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.2 b/metadata/md5-cache/app-admin/mcollective-2.11.2
deleted file mode 100644
index a14a18169035..000000000000
--- a/metadata/md5-cache/app-admin/mcollective-2.11.2
+++ /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=6
-HOMEPAGE=https://docs.puppet.com/mcollective/
-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.2.tar.gz -> mcollective-2.11.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7db5fb9345721e56bcf25713a693560
diff --git a/metadata/md5-cache/app-admin/mcollective-2.11.4 b/metadata/md5-cache/app-admin/mcollective-2.11.4
index 67dc04b26ff5..26be24d882b2 100644
--- a/metadata/md5-cache/app-admin/mcollective-2.11.4
+++ b/metadata/md5-cache/app-admin/mcollective-2.11.4
@@ -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.4.tar.gz -> mcollective-2.11.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a0db2bb3c24c978770c95aee54fd1751
+_md5_=b7db5fb9345721e56bcf25713a693560
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 7bfedaddf3b0..acb115fef164 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r16 b/metadata/md5-cache/app-editors/emacs-23.4-r16
index 858661d4fd0c..1cdd46aa0e84 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r16
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r16
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-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?] net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) 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 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:2 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) !<app-editors/emacs-vcs-23.4
 REQUIRED_USE=?? ( aqua X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-21.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=88f474c8d5faa6fab161fde37539a8d1
+_md5_=713e70df7fe2e05872d7c50082ccad94
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r4 b/metadata/md5-cache/app-editors/emacs-24.5-r4
index 7e64bdb73844..44ed97e10a53 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r4
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r4
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/emacs/
 IUSE=acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=alpha ~amd64 arm 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 hppa ia64 ~mips 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?] net-libs/liblockfile 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 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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 m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( 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 ) ) ) ) ) !<app-editors/emacs-vcs-24.5
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 SRC_URI=mirror://gnu/emacs/emacs-24.5.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-24.5-patches-4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4460cea9b1ca9a80579802124dab4af7
+_md5_=c80f745c7534db42a844105e1e67fac1
diff --git a/metadata/md5-cache/app-editors/emacs-25.3 b/metadata/md5-cache/app-editors/emacs-25.3
index 580e794c2f30..9567ee0234aa 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3
+++ b/metadata/md5-cache/app-editors/emacs-25.3
@@ -4,11 +4,11 @@ DESCRIPTION=The extensible, customizable, self-documenting real-time display edi
 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 motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets 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
+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=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?] net-libs/liblockfile 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 ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) 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:3= ) !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 ) ) ) ) ) !<app-editors/emacs-vcs-25.3
 REQUIRED_USE=?? ( aqua X )
 SLOT=25
 SRC_URI=mirror://gnu/emacs/emacs-25.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=daeee443dbbaea1bccb6ece2b9029bbe
+_md5_=141d794484d286cf1524d5b9c8e71e2c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b272a5acc0ca..2f3f4be6f7c0 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.0_rc0 b/metadata/md5-cache/app-emulation/containerd-1.0.0_rc0
new file mode 100644
index 000000000000..3e89b3b38f23
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.0_rc0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) >=dev-lang/go-1.8
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=+btrfs hardened
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) sys-libs/libseccomp
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.0.0-rc.0.tar.gz -> containerd-1.0.0_rc0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=52f39f2dc19bd74931d3cb5729cd006c
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d244d9248adb..0d626e575a2a 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/cmark-0.27.1 b/metadata/md5-cache/app-text/cmark-0.28.3
index 3e9775ac8fcf..d89aa52b7c3a 100644
--- a/metadata/md5-cache/app-text/cmark-0.27.1
+++ b/metadata/md5-cache/app-text/cmark-0.28.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=CommonMark parsing and rendering library and program in C
 EAPI=6
-HOMEPAGE=https://github.com/jgm/cmark
+HOMEPAGE=https://github.com/commonmark/cmark
 IUSE=test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/jgm/cmark/archive/0.27.1.tar.gz -> cmark-0.27.1.tar.gz
+SRC_URI=https://github.com/commonmark/cmark/archive/0.28.3.tar.gz -> cmark-0.28.3.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=65cb9193b8da9bc9b3fed6628358238a
+_md5_=9de8f2375895ec97d7814f29e0461c1d
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r3 b/metadata/md5-cache/app-text/opensp-1.5.2-r3
index 4d6640409af1..8d1d813975f2 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r3
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libnsl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=36d67df753820a8fb039a0741f02b691
+_md5_=e2b8031ca47945318580be209ead70f4
diff --git a/metadata/md5-cache/app-text/opensp-1.5.2-r6 b/metadata/md5-cache/app-text/opensp-1.5.2-r6
index 9a105ecf58c0..a43cb03c3401 100644
--- a/metadata/md5-cache/app-text/opensp-1.5.2-r6
+++ b/metadata/md5-cache/app-text/opensp-1.5.2-r6
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libnsl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=24835ddcb3cf95dc490d4b42a76603b2
+_md5_=8dff065c52971a5ed9421f1aa431e821
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 53217a0c4b87..781314620131 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.0 b/metadata/md5-cache/dev-db/pgpool2-3.7.0
new file mode 100644
index 000000000000..8374cbd05149
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* ) sys-devel/bison !!dev-db/pgpool
+DESCRIPTION=Connection pool server for PostgreSQL
+EAPI=6
+HOMEPAGE=http://www.pgpool.net/
+IUSE=doc memcached pam ssl static-libs postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 postgres_targets_postgres9_3 postgres_targets_postgres9_2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) postgres_targets_postgres9_3? ( dev-db/postgresql:9.3= ) postgres_targets_postgres9_2? ( dev-db/postgresql:9.2= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:* )
+SLOT=0
+SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.7.0.tar.gz -> pgpool-II-3.7.0.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	postgres	c59d58664169a60e232dd018eae69172	postgres-multi	4ad3669c874bed68b375f87035e46db8	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=b60e7da3108f55253149d34c91eb8a00
diff --git a/metadata/md5-cache/dev-db/pspg-0.7.5 b/metadata/md5-cache/dev-db/pspg-0.7.5
new file mode 100644
index 000000000000..53f0c4c3323e
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pspg-0.7.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:*
+DESCRIPTION=A better pager for psql and mysql
+EAPI=6
+HOMEPAGE=https://github.com/okbob/pspg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:*
+SLOT=0
+SRC_URI=https://github.com/okbob/pspg/archive/0.7.5.tar.gz -> pspg-0.7.5.tar.gz
+_md5_=75e5ccdab485d29355aec94437f7cd32
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 300ff60e8fd6..656eda3cda1c 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index 95c20b1a44a1..41d36fc7f429 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=build 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.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1ee11c5329599ed461832b71654687d8
+_md5_=808849bb5f5ce008aac9df938c3beb62
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ea33a3f3a6ee..42629c32a409 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r4 b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r4
index 77d0a9b25685..e9ad494b641f 100644
--- a/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r4
+++ b/metadata/md5-cache/dev-libs/beecrypt-4.2.1-r4
@@ -11,4 +11,4 @@ REQUIRED_USE=cxx? ( threads ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e209c1f10e0030766963aaa8926120d6
+_md5_=bceb2c6590e2d5fce01c395b4f2843b6
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2 b/metadata/md5-cache/dev-libs/beignet-1.3.2
index 5b16e184c5f7..bfbc2322d4e5 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4.70[video_cards_intel] x11-libs/libXext x11-libs/libXfixes || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ocl-icd? ( dev-libs/ocl-icd ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=OpenCL implementation for Intel GPUs
 EAPI=6
 HOMEPAGE=https://01.org/beignet
 IUSE=ocl-icd ocl20 abi_x86_32 abi_x86_64 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
 LICENSE=LGPL-2.1+
-RDEPEND=media-libs/mesa sys-devel/clang:= sys-devel/llvm:= >=x11-libs/libdrm-2.4.70[video_cards_intel] x11-libs/libXext x11-libs/libXfixes app-eselect/eselect-opencl
+RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] 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(-)?] >=x11-libs/libdrm-2.4.70[video_cards_intel,abi_x86_32(-)?,abi_x86_64(-)?,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/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(-)?] app-eselect/eselect-opencl
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	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	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2ae2ab3d94f07dc05e75413c78f0d6f4
+_md5_=c805ccc6e870984d7df224e7b1f20884
diff --git a/metadata/md5-cache/dev-libs/botan-2.3.0 b/metadata/md5-cache/dev-libs/botan-2.3.0
index 4e9e521b109f..9ed838e86e3f 100644
--- a/metadata/md5-cache/dev-libs/botan-2.3.0
+++ b/metadata/md5-cache/dev-libs/botan-2.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A C++ crypto library
 EAPI=6
 HOMEPAGE=http://botan.randombit.net/
 IUSE=bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-macos
 LICENSE=BSD
 RDEPEND=bzip2? ( >=app-arch/bzip2-1.0.5 ) zlib? ( >=sys-libs/zlib-1.2.3 ) boost? ( 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-libs/boost-1.48[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(-)] ) lzma? ( app-arch/xz-utils ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) )
 REQUIRED_USE=python? ( boost ) boost? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2/3
 SRC_URI=http://botan.randombit.net/releases/Botan-2.3.0.tgz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=021f94cecd0d3934c8e1f36d2959b365
+_md5_=4b473039e107bc43dd0cc7b1590398db
diff --git a/metadata/md5-cache/dev-libs/libinput-1.9.1 b/metadata/md5-cache/dev-libs/libinput-1.9.1
deleted file mode 100644
index 4389a6e9e7af..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.1.tar.xz
-_eclasses_=meson	0946ddca90e9c2d3e4687bb097dd9ed3	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/libinput-1.9.0 b/metadata/md5-cache/dev-libs/libinput-1.9.3
index cf39e2b0694d..84351798f789 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.9.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.9.3
@@ -9,6 +9,6 @@ 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
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.9.3.tar.xz
 _eclasses_=meson	0946ddca90e9c2d3e4687bb097dd9ed3	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/libmemcached-0.50 b/metadata/md5-cache/dev-libs/libmemcached-0.50
deleted file mode 100644
index cace1c0a990b..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-0.50
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=net-misc/memcached virtual/perl-Pod-Parser doc? ( dev-python/sphinx ) libevent? ( dev-libs/libevent ) tcmalloc? ( dev-util/google-perftools ) sasl? ( virtual/gsasl )
-DESCRIPTION=a C client library to the memcached server
-EAPI=3
-HOMEPAGE=http://tangent.org/552/libmemcached.html
-IUSE=debug doc hsieh +libevent sasl static-libs tcmalloc
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached virtual/perl-Pod-Parser doc? ( dev-python/sphinx ) libevent? ( dev-libs/libevent ) tcmalloc? ( dev-util/google-perftools ) sasl? ( virtual/gsasl )
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/0.50/+download/libmemcached-0.50.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a503bb7796c1187592d1f65328d13c8f
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r3 b/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r3
deleted file mode 100644
index 5c1be16910e6..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=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 C client library to the memcached server
-EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.17/+download/libmemcached-1.0.17.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=744c25434c829871f0d8a2923334ba8f
diff --git a/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r4 b/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r4
deleted file mode 100644
index 395fd995156b..000000000000
--- a/metadata/md5-cache/dev-libs/libmemcached-1.0.17-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent ) >=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 C client library to the memcached server
-EAPI=5
-HOMEPAGE=http://libmemcached.org/libMemcached.html
-IUSE=debug hsieh +libevent sasl static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=net-misc/memcached sasl? ( dev-libs/cyrus-sasl ) libevent? ( dev-libs/libevent )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/libmemcached/1.0/1.0.17/+download/libmemcached-1.0.17.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b9d6ce783ba66c771d99cd41da985764
diff --git a/metadata/md5-cache/dev-libs/libmowgli-2.0.0-r1 b/metadata/md5-cache/dev-libs/libmowgli-2.0.0-r1
deleted file mode 100644
index 3d5bf2cedc3d..000000000000
--- a/metadata/md5-cache/dev-libs/libmowgli-2.0.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-DESCRIPTION=Useful set of performance and usability-oriented extensions to C
-EAPI=5
-HOMEPAGE=http://atheme.org/projects/libmowgli.html
-IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
-SLOT=2
-SRC_URI=http://atheme.org/downloads/libmowgli-2.0.0.tar.gz
-_md5_=108d4caa5d58b456ffa5e7b80b6a6eb4
diff --git a/metadata/md5-cache/dev-libs/libmowgli-9999 b/metadata/md5-cache/dev-libs/libmowgli-9999
index 251675473359..19dde3b60264 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-9999
+++ b/metadata/md5-cache/dev-libs/libmowgli-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure unpack
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-vcs/git
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Useful set of performance and usability-oriented extensions to C
-EAPI=5
+EAPI=6
 HOMEPAGE=http://atheme.org/projects/libmowgli.html
 IUSE=libressl ssl
 LICENSE=BSD-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=2
-_eclasses_=git-2	195a672bfaf52d868442171c9469bbb6
-_md5_=29854983de5974bd586e8ef25f325f24
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
+_md5_=736bb457c94b6952c5b8760dd1f2c1df
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.30 b/metadata/md5-cache/dev-libs/libpcre2-10.30
index d14a16c3bff7..db675d201eb5 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.30
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.30
@@ -4,11 +4,11 @@ DESCRIPTION=Perl-compatible regular expression library
 EAPI=6
 HOMEPAGE=http://www.pcre.org/
 IUSE=bzip2 +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 ~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=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:0= )
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcre/pcre2-10.30.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.30.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1fb667984cabbae3a08cfb32b558a749
+_md5_=a10b5e01a247d18173442db6bfb3dd6d
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 99f2791cac27..85e620ad4654 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/cachetools-1.1.5 b/metadata/md5-cache/dev-python/cachetools-1.1.5
index a2453371fdc1..dca49222df20 100644
--- a/metadata/md5-cache/dev-python/cachetools-1.1.5
+++ b/metadata/md5-cache/dev-python/cachetools-1.1.5
@@ -1,5 +1,5 @@
 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(-)]
+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(-)] 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=Extensible memoizing collections and decorators
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/cachetools
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-1.1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4eb3b3a20c3ba913a34b7aaca60301ea
+_md5_=7cd142b1ce41a115183fbf0ff956d1e0
diff --git a/metadata/md5-cache/dev-python/cachetools-2.0.0 b/metadata/md5-cache/dev-python/cachetools-2.0.0
index 11863b96bff2..2345a122f033 100644
--- a/metadata/md5-cache/dev-python/cachetools-2.0.0
+++ b/metadata/md5-cache/dev-python/cachetools-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[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_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(-)]
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/pytest[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_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(-)]
 DESCRIPTION=Extensible memoizing collections and decorators
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/cachetools
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-2.0.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_=e97b9a3486f66ee3ca54edced643a1a4
+_md5_=d128c88425667f0a2bcc39984ea87a25
diff --git a/metadata/md5-cache/dev-python/cachetools-2.0.1 b/metadata/md5-cache/dev-python/cachetools-2.0.1
index 31cda454e13d..cfef5f31c090 100644
--- a/metadata/md5-cache/dev-python/cachetools-2.0.1
+++ b/metadata/md5-cache/dev-python/cachetools-2.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[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_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(-)]
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/pytest[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_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(-)]
 DESCRIPTION=Extensible memoizing collections and decorators
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/cachetools
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-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_=e97b9a3486f66ee3ca54edced643a1a4
+_md5_=d128c88425667f0a2bcc39984ea87a25
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.4 b/metadata/md5-cache/dev-python/contextlib2-0.5.4
index 05b6abf0867a..561c78bbefa5 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.4
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/unittest2[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_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(-)]
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/unittest2[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_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(-)]
 DESCRIPTION=Backports and enhancements for the contextlib module
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/contextlib2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-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_=37c14b058e4b3db25d72eadeec6cadff
+_md5_=1823ec9bc2fe1d971d9eca383f9d6480
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index 6f7c4b29727e..563a7865cc32 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/unittest2[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(-)]
+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(-)] test? ( dev-python/unittest2[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=Backports and enhancements for the contextlib module
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/contextlib2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.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_=60537fce4309934cce8f7a1a4d8a7b0d
+_md5_=d6804a58fc2cdaf4c10f531f8d6a8404
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.4.0 b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
index 4b2ee277d5d0..7041cbba6949 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.4.0
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/jupyter-1.0.0-r1 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/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(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/ipython-4.0.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(-)] ) 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/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_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/jupyter-1.0.0-r1 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/sphinxcontrib-github-alt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/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(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/ipython-4.0.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(-)] ) 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 common functionality of Jupyter projects
 EAPI=6
 HOMEPAGE=http://jupyter.org
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.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_=38d0c9da575a25ff8272d7541741eb2e
+_md5_=f2281d5198585ca533212246f63ebc05
diff --git a/metadata/md5-cache/dev-python/setuptools-36.7.2 b/metadata/md5-cache/dev-python/setuptools-36.7.2
index c9e88856837c..ad7f7254e62b 100644
--- a/metadata/md5-cache/dev-python/setuptools-36.7.2
+++ b/metadata/md5-cache/dev-python/setuptools-36.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[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.8[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-fixture-config[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-virtualenv[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/backports-unittest-mock-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/wheel[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=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) 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_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(-)]
+DEPEND=app-arch/unzip test? ( dev-python/pip[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-3.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(-)] dev-python/pytest-fixture-config[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-virtualenv[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/backports-unittest-mock-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/wheel[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=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) 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_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=Collection of extensions to Distutils
 EAPI=6
 HOMEPAGE=https://github.com/pypa/setuptools https://pypi.python.org/pypi/setuptools
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-36.7.2.zip
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3e6ebb8c42d4642beb6dfd07527028d
+_md5_=79ddcb2a3275256526bb75add0427aef
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 366651cf7218..73c7785c37ba 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.5 b/metadata/md5-cache/dev-ros/genpy-0.6.5
deleted file mode 100644
index 3b9b159c1fc9..000000000000
--- a/metadata/md5-cache/dev-ros/genpy-0.6.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python ROS message and service generators
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/genpy
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[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/0.6.5
-SRC_URI=https://github.com/ros/genpy/archive/0.6.5.tar.gz -> genpy-0.6.5.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48d1a1da05ebcc8c49b4e94e552b5a5f
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.6 b/metadata/md5-cache/dev-ros/genpy-0.6.6
deleted file mode 100644
index b9c3f715a189..000000000000
--- a/metadata/md5-cache/dev-ros/genpy-0.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python ROS message and service generators
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/genpy
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg[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/0.6.6
-SRC_URI=https://github.com/ros/genpy/archive/0.6.6.tar.gz -> genpy-0.6.6.tar.gz
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48d1a1da05ebcc8c49b4e94e552b5a5f
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.7 b/metadata/md5-cache/dev-ros/genpy-0.6.7
index 17c09b67a972..a835d7002f7b 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.7
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[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(-)]
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[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/0.6.7
 SRC_URI=https://github.com/ros/genpy/archive/0.6.7.tar.gz -> genpy-0.6.7.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48d1a1da05ebcc8c49b4e94e552b5a5f
+_md5_=77f6fb73c0c5c2957dbac17520cfad4d
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index 2298e4b98f66..197e95369217 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[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(-)]
+RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[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/9999
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=48d1a1da05ebcc8c49b4e94e552b5a5f
+_md5_=77f6fb73c0c5c2957dbac17520cfad4d
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 8db83af9510f..1aac8b50ce17 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.10 b/metadata/md5-cache/dev-ruby/gettext-setup-0.10
deleted file mode 100644
index a2c359c2e36b..000000000000
--- a/metadata/md5-cache/dev-ruby/gettext-setup-0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=A gem to ease i18n
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/gettext-setup-gem
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[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=0
-SRC_URI=https://github.com/puppetlabs/gettext-setup-gem/archive/0.10.tar.gz -> gettext-setup-0.10.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0550ba37697d6294cc4be433cec959ee
diff --git a/metadata/md5-cache/dev-ruby/gettext-setup-0.29 b/metadata/md5-cache/dev-ruby/gettext-setup-0.29
new file mode 100644
index 000000000000..b7fbb8f6d69a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gettext-setup-0.29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby24] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby24] dev-ruby/locale[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/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 gem to ease i18n
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/gettext-setup-gem
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby22] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby22] dev-ruby/locale[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby23] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby23] dev-ruby/locale[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/fast_gettext-1.1.0[ruby_targets_ruby24] >=dev-ruby/ruby-gettext-3.0.2[ruby_targets_ruby24] dev-ruby/locale[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/puppetlabs/gettext-setup-gem/archive/0.29.tar.gz -> gettext-setup-0.29.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=edbd2d49a0b612b6df1d497561ffa8c9
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4 b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
index e373c9750c42..67f23ed8616a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-core
 IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm 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 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-ruby/rspec-support-3.5*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[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=https://github.com/rspec/rspec-core/archive/v3.5.4.tar.gz -> rspec-core-3.5.4-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ec463002a229a5601585c8a7faae0cdf
+_md5_=b79f76e5e456b41c40c98369d22537e7
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
index 9e595a2e649f..c36c2ce51870 100644
--- a/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-expectations
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm 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 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-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.5*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] <dev-ruby/diff-lcs-2[ruby_targets_ruby23] =dev-ruby/rspec-support-3.5*[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=https://github.com/rspec/rspec-expectations/archive/v3.5.0.tar.gz -> rspec-expectations-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7defe0e8ef6cb65daa3964d693bc74e9
+_md5_=b6eb1d5e375d49f7e7588d447d04b1a0
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
index 8caba63e2926..62dbd68a64fb 100644
--- a/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-mocks
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=alpha amd64 arm 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 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-ruby/rspec-support-3.5*[ruby_targets_ruby22] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] =dev-ruby/diff-lcs-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.5*[ruby_targets_ruby23] >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby23] =dev-ruby/diff-lcs-1*[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=https://github.com/rspec/rspec-mocks/archive/v3.5.0.tar.gz -> rspec-mocks-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=be4755d0a40dbdfc5b1df6b434a08dc9
+_md5_=0f464c69c13a4e773c8c8269108be84b
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
index f99979a87b4b..d5caa579086a 100644
--- a/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-support
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=alpha amd64 arm 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 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_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=https://github.com/rspec/rspec-support/archive/v3.5.0.tar.gz -> rspec-support-3.5.0-git.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	1a95cd8be181598c8171cf918aa225d9	ruby-utils	f8a0644cb27ba724df27b2a20a739b53	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4640c2f48d820b20da1c036e4a5b37b0
+_md5_=3608a3269f4f41662e37bee2cd937e1d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index bf409e4a6dbe..318248ad6414 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/catalyst-2.9999 b/metadata/md5-cache/dev-util/catalyst-2.9999
deleted file mode 100644
index 6531246c1ddf..000000000000
--- a/metadata/md5-cache/dev-util/catalyst-2.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.5.2 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-vcs/git
-DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc kernel_linux python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND==dev-python/pydecomp-9999 app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50c22860fb86d3333c26e2d13049df00
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.0 b/metadata/md5-cache/dev-util/catalyst-3.0.0
new file mode 100644
index 000000000000..fc84e65e4581
--- /dev/null
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Release metatool used for creating releases based on Gentoo Linux
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
+IUSE=ccache doc kernel_linux 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
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pydecomp-0.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(-)] app-arch/lbzip2 app-crypt/shash !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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://gentoo/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0.0.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c5297a687ccb86a7ed2baa7a155f3936
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0_rc1 b/metadata/md5-cache/dev-util/catalyst-3.0_rc1
deleted file mode 100644
index ea379b5aef07..000000000000
--- a/metadata/md5-cache/dev-util/catalyst-3.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.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(-)] 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=Release metatool used for creating releases based on Gentoo Linux
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-python/pydecomp-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(-)] app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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://gentoo/catalyst-3.0_rc1.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-3.0_rc1.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-3.0_rc1.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-3.0_rc1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a85c33e38802c6938d08780029b7928
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index c0baa12e7ab4..4e5de45ae0b0 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)] dev-vcs/git
+DEPEND=app-text/asciidoc >=dev-python/snakeoil-0.6.5[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(-)] dev-vcs/git
 DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
-IUSE=ccache doc kernel_linux python_targets_python3_4 python_targets_python3_5
+IUSE=ccache doc kernel_linux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-2
-RDEPEND==dev-python/pydecomp-9999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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==dev-python/pydecomp-9999[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-arch/lbzip2 app-crypt/shash !x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) x86-fbsd? ( app-arch/libarchive[xattr] ) virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) ia64? ( sys-fs/dosfstools ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) 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
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8bc2281b20ebd05d897d6d38403c215
+_md5_=f14bb335ac59f645c0e761cf9f22807e
diff --git a/metadata/md5-cache/dev-util/goland-2017.3 b/metadata/md5-cache/dev-util/goland-2017.3
new file mode 100644
index 000000000000..ef42682c226a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/goland-2017.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2017.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0a722fd2df349bdd585757860daa80ba
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.6.2 b/metadata/md5-cache/dev-util/google-perftools-2.6.2
new file mode 100644
index 000000000000..254afe9bdfdc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/google-perftools-2.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/libunwind >=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=Fast, multi-threaded malloc() and nifty performance analysis tools
+EAPI=6
+HOMEPAGE=https://github.com/gperftools/gperftools
+IUSE=largepages +debug minimal optimisememory test 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 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=sys-libs/libunwind
+SLOT=0/4
+SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.2 -> gperftools-2.6.2.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=fad3549bc582155ab552bb6efd85463d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 7ccede945f71..9e93cab0d7a1 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
index 3d84888a08ba..f36ae6316eea 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=68022da287f504b569d22661fe607407
+_md5_=90ccc6af6c61522816ec7e80a2768e6e
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 03fe01b6acb9..854623c7c10e 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/fakk2-1.02 b/metadata/md5-cache/games-action/fakk2-1.02
index d0dfdab1b598..56e52e7b28a4 100644
--- a/metadata/md5-cache/games-action/fakk2-1.02
+++ b/metadata/md5-cache/games-action/fakk2-1.02
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Heavy Metal: FAKK2 - 3D third-person action shooter based on the Heavy Metal comics/movies
+DESCRIPTION=3D third-person action shooter based on the Heavy Metal comics/movies
 EAPI=5
 HOMEPAGE=http://www.lokigames.com/products/fakk2/
 IUSE=nocd
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	593beee21fc1247ccf32244f399982a7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c722203982643cb3ff81efb77205845c
+_md5_=708693b62d9495f1ab2de635286092ce
diff --git a/metadata/md5-cache/games-action/fakk2-1.02-r1 b/metadata/md5-cache/games-action/fakk2-1.02-r1
index 932e45644bc9..d9fc1382f62b 100644
--- a/metadata/md5-cache/games-action/fakk2-1.02-r1
+++ b/metadata/md5-cache/games-action/fakk2-1.02-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst setup
-DESCRIPTION=Heavy Metal: FAKK2 - 3D third-person action shooter based on the Heavy Metal comics/movies
+DESCRIPTION=3D third-person action shooter based on the Heavy Metal comics/movies
 EAPI=6
 HOMEPAGE=http://www.lokigames.com/products/fakk2/
 IUSE=nocd
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl
 RESTRICT=strip
 SLOT=0
 _eclasses_=cdrom	593beee21fc1247ccf32244f399982a7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8df7adb17f02cbb3e2d0d0555f46b30a
+_md5_=267f43ea65dc4373e42a43bd2e49fe4d
diff --git a/metadata/md5-cache/games-action/trine-bin-1.08 b/metadata/md5-cache/games-action/trine-bin-1.08
index 4eba29730bab..cb832310f74b 100644
--- a/metadata/md5-cache/games-action/trine-bin-1.08
+++ b/metadata/md5-cache/games-action/trine-bin-1.08
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=a physics-based action game where diff characters allow diff solutions to challenges
+DESCRIPTION=A physics-based action game with character-dependent solutions to challenges
 EAPI=5
 HOMEPAGE=http://trine-thegame.com/
 KEYWORDS=-* ~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=fetch strip
 SLOT=0
 SRC_URI=Trine.64.run
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5a7e327d56d8e63fe81dc71ed0f60e9e
+_md5_=176fffcf4149c1d359689a7d6b3b2579
diff --git a/metadata/md5-cache/games-action/trine-bin-1.08-r1 b/metadata/md5-cache/games-action/trine-bin-1.08-r1
index 446cf640fb07..7ea5ac25554e 100644
--- a/metadata/md5-cache/games-action/trine-bin-1.08-r1
+++ b/metadata/md5-cache/games-action/trine-bin-1.08-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install nofetch unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=A physics-based action game where diff characters allow diff solutions to challenges
+DESCRIPTION=A physics-based action game with character-dependent solutions to challenges
 EAPI=6
 HOMEPAGE=http://trine-thegame.com/
 KEYWORDS=-* ~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=fetch strip
 SLOT=0
 SRC_URI=Trine.64.run
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=da96db4d29cc986966f3293d1d966cef
+_md5_=3d2ea79048bc19417993ea3d93bbe43b
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 1c0895107b5f..5f9ca342aea3 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/bloboats-1.0.2 b/metadata/md5-cache/games-arcade/bloboats-1.0.2
index 43a5cd5afc1f..69fdaa91b811 100644
--- a/metadata/md5-cache/games-arcade/bloboats-1.0.2
+++ b/metadata/md5-cache/games-arcade/bloboats-1.0.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net virtual/opengl virtual/glu media-libs/libvorbis
-DESCRIPTION=arcade-like boat racing game combining platform jumpers and elastomania / x-moto like games
+DESCRIPTION=Arcade-like boat racing game combining platform jumpers and x-moto like games
 EAPI=5
 HOMEPAGE=http://bloboats.dy.fi/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[opengl,video] media-libs/sdl-mixer[vorbis] media-libs/
 SLOT=0
 SRC_URI=http://mirror.kapsi.fi/bloboats.dy.fi/bloboats-1.0.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d861c025651a4280844d46119bedf1fc
+_md5_=fe752c55315de6e24122d7d805cbd7b5
diff --git a/metadata/md5-cache/games-arcade/mrrescue-1.02b b/metadata/md5-cache/games-arcade/mrrescue-1.02b
index ff4f5befa716..55e557902690 100644
--- a/metadata/md5-cache/games-arcade/mrrescue-1.02b
+++ b/metadata/md5-cache/games-arcade/mrrescue-1.02b
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Arcade styled 2d action game centered around evacuating civilians from burning buildings
+DESCRIPTION=Arcade 2d action game based around evacuating civilians from burning buildings
 EAPI=5
 HOMEPAGE=http://tangramgames.dk/games/mrrescue/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=games-engines/love:0 games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/SimonLarsen/mrrescue/releases/download/v1.02b/mrrescue-1.02b-love.zip https://dev.gentoo.org/~hasufell/distfiles/mrrescue.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f21b39255728a8e5daadc47b97f0341d
+_md5_=a8e43a4113787c0bcbcf17f2c3e84eda
diff --git a/metadata/md5-cache/games-arcade/orthorobot-0 b/metadata/md5-cache/games-arcade/orthorobot-0
index 92c4119d4af0..7d0bbed6fac0 100644
--- a/metadata/md5-cache/games-arcade/orthorobot-0
+++ b/metadata/md5-cache/games-arcade/orthorobot-0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=games-engines/love-0.8.0 app-arch/unzip
-DESCRIPTION=Nice perspective based puzzle game, where you flatten the view to move across gaps
+DESCRIPTION=Perspective based puzzle game, where you flatten the view to move across gaps
 EAPI=5
 HOMEPAGE=http://stabyourself.net/orthorobot/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=games-engines/love-0.8.0 games-misc/games-envd
 SLOT=0
 SRC_URI=http://stabyourself.net/dl.php?file=orthorobot/orthorobot-source.zip -> orthorobot-0.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8e4716d09d9dbee13546a4b541e31501
+_md5_=56ddf1fc2a638147aaef69055411eb22
diff --git a/metadata/md5-cache/games-arcade/pacmanarena-0.15 b/metadata/md5-cache/games-arcade/pacmanarena-0.15
index 7a5c77761dda..158fe718f666 100644
--- a/metadata/md5-cache/games-arcade/pacmanarena-0.15
+++ b/metadata/md5-cache/games-arcade/pacmanarena-0.15
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] media-libs/sdl-net 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=a Pacman clone in full 3D with a few surprises. Rockets, bombs and explosions abound
+DESCRIPTION=3D Pacman clone with a few surprises. Rockets, bombs and explosions abound
 EAPI=5
 HOMEPAGE=http://pacmanarena.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=mirror://sourceforge/pacmanarena/pacman-arena-0.15.tar.bz2 mirror://sourceforge/pacmanarena/pacman-data-0.0.zip
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=276337d9028cef731c496a78365e9018
+_md5_=44eae825717daecf6f7952496fbf1a9c
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 770e569cafc3..f4cc62bf6350 100644
--- a/metadata/md5-cache/games-board/Manifest.gz
+++ b/metadata/md5-cache/games-board/Manifest.gz
diff --git a/metadata/md5-cache/games-board/capicity-1.0 b/metadata/md5-cache/games-board/capicity-1.0
index 4ee517b7ef96..f74af41fa62c 100644
--- a/metadata/md5-cache/games-board/capicity-1.0
+++ b/metadata/md5-cache/games-board/capicity-1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 ) >=sys-apps/sed-4
-DESCRIPTION=A monopd compatible boardgame to play Monopoly-like games (previously named capitalism)
+DESCRIPTION=Monopd compatible boardgame for Monopoly-like games, previously named capitalism
 EAPI=5
 HOMEPAGE=http://linux-ecke.de/CapiCity/
 IUSE=dedicated
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 ) games-m
 SLOT=0
 SRC_URI=dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/Capid_1.0.tar.gz ) !dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/CapiCity_1.0.tar.gz )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92dc0942fcf3bbaa957b0d78813bc328
+_md5_=10c6e18242028b9689187e7a5771c117
diff --git a/metadata/md5-cache/games-board/capicity-1.0-r1 b/metadata/md5-cache/games-board/capicity-1.0-r1
index 61aa40c6b976..47f9363f46c8 100644
--- a/metadata/md5-cache/games-board/capicity-1.0-r1
+++ b/metadata/md5-cache/games-board/capicity-1.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm preinst unpack
 DEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 ) >=sys-apps/sed-4
-DESCRIPTION=A monopd compatible boardgame to play Monopoly-like games (previously named capitalism)
+DESCRIPTION=Monopd compatible boardgame for Monopoly-like games, previously named capitalism
 EAPI=6
 HOMEPAGE=http://linux-ecke.de/CapiCity/
 IUSE=dedicated
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtscript:4 !dedicated? ( dev-qt/qtgui:4 )
 SLOT=0
 SRC_URI=dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/Capid_1.0.tar.gz ) !dedicated? ( mirror://sourceforge/project/capitalism/Capi%20City/1.0/CapiCity_1.0.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e75e84e4ee420b7e950ec958f2780c6f
+_md5_=f8d5c2ac5877ae4cb4ee94ab2b3f9dd1
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 7156434c1f15..549aae536f9a 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/caps-20071115 b/metadata/md5-cache/games-emulation/caps-20071115
index ed6dc7a747ed..ae8fc3d79225 100644
--- a/metadata/md5-cache/games-emulation/caps-20071115
+++ b/metadata/md5-cache/games-emulation/caps-20071115
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=app-arch/unzip
-DESCRIPTION=Support library that allows third party applications access and use C.A.P.S. images
+DESCRIPTION=Support library for accessing and using C.A.P.S. images
 EAPI=5
 HOMEPAGE=http://www.softpres.org/
 IUSE=doc
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ipfdevlib_linux-20060612.tgz amd64? ( mirror://gentoo/ipflib_linux-amd64-20071115.tgz ) doc? ( mirror://gentoo/ipfdoc102a.zip ) mirror://gentoo/config_uae_ocs13_512c-512s.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=98155c9fa30ae100d239ffa6ef1b17ae
+_md5_=46c0a1a69c0c5b177ef47f7bcb55b43a
diff --git a/metadata/md5-cache/games-emulation/emutos-0.9.3 b/metadata/md5-cache/games-emulation/emutos-0.9.3
index ccef4a846a5a..4e090a6e5314 100644
--- a/metadata/md5-cache/games-emulation/emutos-0.9.3
+++ b/metadata/md5-cache/games-emulation/emutos-0.9.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=a single-user single-tasking operating system for 32 bit Atari computer emulators
+DESCRIPTION=Single-user single-tasking operating system for 32 bit Atari computer emulators
 EAPI=5
 HOMEPAGE=http://emutos.sourceforge.net
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz mirror://sourceforge/emutos/emutos-512k-0.9.3.zip mirror://sourceforge/emutos/emutos-256k-0.9.3.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=88625eeb7a4c332f2fca0388a0c2db88
+_md5_=c6d02dd7da20838c973d4dcae62c0061
diff --git a/metadata/md5-cache/games-emulation/emutos-0.9.4 b/metadata/md5-cache/games-emulation/emutos-0.9.4
index ed4b08e35c37..5139bd2e85aa 100644
--- a/metadata/md5-cache/games-emulation/emutos-0.9.4
+++ b/metadata/md5-cache/games-emulation/emutos-0.9.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=a single-user single-tasking operating system for 32 bit Atari computer emulators
+DESCRIPTION=Single-user single-tasking operating system for 32 bit Atari computer emulators
 EAPI=5
 HOMEPAGE=http://emutos.sourceforge.net
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz mirror://sourceforge/emutos/emutos-512k-0.9.4.zip mirror://sourceforge/emutos/emutos-256k-0.9.4.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=88625eeb7a4c332f2fca0388a0c2db88
+_md5_=c6d02dd7da20838c973d4dcae62c0061
diff --git a/metadata/md5-cache/games-emulation/fbzx-2.10.0 b/metadata/md5-cache/games-emulation/fbzx-2.10.0
index dd9266dfdbcf..2015743a301a 100644
--- a/metadata/md5-cache/games-emulation/fbzx-2.10.0
+++ b/metadata/md5-cache/games-emulation/fbzx-2.10.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtual/pkgconfig
-DESCRIPTION=A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer
+DESCRIPTION=Full Screen Sinclair Spectrum emulator
 EAPI=5
 HOMEPAGE=http://www.rastersoft.com/fbzx.html
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib game
 SLOT=0
 SRC_URI=http://www.rastersoft.com/descargas/fbzx-2.10.0.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=4049c263b1da6f79625994ae86113e5d
+_md5_=d6da9515cba3b6b933fc47ac97be2ec9
diff --git a/metadata/md5-cache/games-emulation/fbzx-3.0.0 b/metadata/md5-cache/games-emulation/fbzx-3.0.0
index d7c9cb1b2a71..d035c823d310 100644
--- a/metadata/md5-cache/games-emulation/fbzx-3.0.0
+++ b/metadata/md5-cache/games-emulation/fbzx-3.0.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtual/pkgconfig
-DESCRIPTION=A Sinclair Spectrum emulator, designed to work at full screen using the FrameBuffer
+DESCRIPTION=Full Screen Sinclair Spectrum emulator
 EAPI=5
 HOMEPAGE=https://github.com/rastersoft/fbzx
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib game
 SLOT=0
 SRC_URI=https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> fbzx-3.0.0.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7f4f7f188ff9d74f939d1b6ae8bc66bd
+_md5_=74bb521ef9c83799567e3740348b17b3
diff --git a/metadata/md5-cache/games-emulation/zinc-1.1 b/metadata/md5-cache/games-emulation/zinc-1.1
index ac8157cb07aa..9f7b9eb8ba1a 100644
--- a/metadata/md5-cache/games-emulation/zinc-1.1
+++ b/metadata/md5-cache/games-emulation/zinc-1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=An x86 binary-only emulator for the Sony ZN-1, ZN-2, and Namco System 11 arcade systems
+DESCRIPTION=An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades
 EAPI=5
 HOMEPAGE=http://caesar.logiqx.com/php/emulator.php?id=zinc_linux
 KEYWORDS=-* ~amd64 ~x86
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://caesar.logiqx.com/zips/emus/linux/zinc_linux/zinc11-lnx.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=573fd705a951a05dafff9fc9a89687d8
+_md5_=94ad25626ef47daaac74dee2a05879ad
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index a7cd10e673fc..64e42a7b8a0b 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/frobtads-1.2.2 b/metadata/md5-cache/games-engines/frobtads-1.2.2
index eae5723b66ec..376f89b2833c 100644
--- a/metadata/md5-cache/games-engines/frobtads-1.2.2
+++ b/metadata/md5-cache/games-engines/frobtads-1.2.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DEPEND=net-misc/curl sys-libs/ncurses:0
-DESCRIPTION=Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures
+DESCRIPTION=Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures
 EAPI=5
 HOMEPAGE=http://www.tads.org/frobtads.htm
 IUSE=debug tads2compiler tads3compiler
@@ -11,4 +11,4 @@ RESTRICT=!tads3compiler? ( test )
 SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=64eba6683d06733c2b8d9ded86ef2559
+_md5_=0f2633eb2ee2360e4ae035326b13cde1
diff --git a/metadata/md5-cache/games-engines/frobtads-1.2.3 b/metadata/md5-cache/games-engines/frobtads-1.2.3
index 36d0ad6856bd..108fa98f3513 100644
--- a/metadata/md5-cache/games-engines/frobtads-1.2.3
+++ b/metadata/md5-cache/games-engines/frobtads-1.2.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DEPEND=net-misc/curl sys-libs/ncurses:0
-DESCRIPTION=Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures
+DESCRIPTION=Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures
 EAPI=5
 HOMEPAGE=http://www.tads.org/frobtads.htm
 IUSE=debug tads2compiler tads3compiler
@@ -11,4 +11,4 @@ RESTRICT=!tads3compiler? ( test )
 SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.3.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1379e337e3140b587f47dbe3181cdc6b
+_md5_=417bd46922498673db084b9c7e133002
diff --git a/metadata/md5-cache/games-engines/frobtads-1.2.3-r1 b/metadata/md5-cache/games-engines/frobtads-1.2.3-r1
index ea0043e80131..9ccca8104267 100644
--- a/metadata/md5-cache/games-engines/frobtads-1.2.3-r1
+++ b/metadata/md5-cache/games-engines/frobtads-1.2.3-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install test
 DEPEND=net-misc/curl sys-libs/ncurses:0
-DESCRIPTION=Curses-based interpreter and development tools for TADS 2 and TADS 3 text adventures
+DESCRIPTION=Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures
 EAPI=6
 HOMEPAGE=http://www.tads.org/frobtads.htm
 IUSE=debug tads2compiler tads3compiler
@@ -11,4 +11,4 @@ RESTRICT=!tads3compiler? ( test )
 SLOT=0
 SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9756bc3452fb41b571809223f5d72910
+_md5_=2ebce1927e7a067e485ae98da8ad9cb0
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 783ac7b42f07..1f01b2f4269b 100644
--- a/metadata/md5-cache/games-fps/Manifest.gz
+++ b/metadata/md5-cache/games-fps/Manifest.gz
diff --git a/metadata/md5-cache/games-fps/doom3-lms-4 b/metadata/md5-cache/games-fps/doom3-lms-4
index 3c2884040405..30c43d24f5fc 100644
--- a/metadata/md5-cache/games-fps/doom3-lms-4
+++ b/metadata/md5-cache/games-fps/doom3-lms-4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=Doom 3 Last Man Standing - add co-op support and/or play against swarms of monsters
+DESCRIPTION=Doom 3 Last Man Standing - add co-op support or play against swarms of monsters
 EAPI=5
 HOMEPAGE=http://doom3coop.com/
 IUSE=dedicated opengl dedicated opengl
@@ -11,4 +11,4 @@ RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=LastManStandingCoop4Multiplatform.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b85455391e7aa42f57576a9ab946d8cd
+_md5_=4a871cc8ebccdd993b566e304f1b0734
diff --git a/metadata/md5-cache/games-fps/glxquake-bin-0-r2 b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
index e50b40681088..57ac1f9a7d15 100644
--- a/metadata/md5-cache/games-fps/glxquake-bin-0-r2
+++ b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=a binary that works with every 3D-graphics-card that supports the glx X-extension
+DESCRIPTION=A binary that works with any 3D-graphics-card that supports the glx X-extension
 EAPI=5
 HOMEPAGE=http://mfcn.ilo.de/glxquake/
 KEYWORDS=-* ~amd64 ~x86
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f9adbd74408f2de886e19fa1555191d7
+_md5_=42875a9f9b5043a8ef7456eded0670f6
diff --git a/metadata/md5-cache/games-fps/sauerbraten-2013.02.03 b/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
index fadcad7a1d45..7563694d3d3c 100644
--- a/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
+++ b/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[X,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] virtual/opengl virtual/glu x11-libs/libX11 ) >=sys-apps/sed-4
-DESCRIPTION=Cube 2: Sauerbraten is an open source game engine (Cube 2) with freeware game data (Sauerbraten)
+DESCRIPTION=Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)
 EAPI=5
 HOMEPAGE=http://sauerbraten.org/
 IUSE=debug dedicated server
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[
 SLOT=0
 SRC_URI=mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_2013_02_03_collect_edition_linux.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd527da8baf47fdc2303fa31332a310a
+_md5_=454db34f44c4fc929701ac79abaa4690
diff --git a/metadata/md5-cache/games-fps/ut2003-data-2107 b/metadata/md5-cache/games-fps/ut2003-data-2107
index 5f2a50eca505..ae090c4fb0dd 100644
--- a/metadata/md5-cache/games-fps/ut2003-data-2107
+++ b/metadata/md5-cache/games-fps/ut2003-data-2107
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip games-util/uz2unpack
-DESCRIPTION=Unreal Tournament 2003 - Sequel to the 1999 Game of the Year multi-player first-person shooter
+DESCRIPTION=Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter
 EAPI=5
 HOMEPAGE=http://www.unrealtournament2003.com/
 KEYWORDS=~amd64 ~x86
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	593beee21fc1247ccf32244f399982a7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=173413e2851b62a482ba33a1f05b2234
+_md5_=41fea78d1a305b47e6af75e5cf5ce9d7
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
index c7cbd5d065be..edb118351d66 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=Demo for the sequel to the 1999 Game of the Year multi-player first-person shooter
+DESCRIPTION=Demo for the sequel to the 1999 multi-player first-person shooter
 EAPI=5
 HOMEPAGE=http://www.ut2003.com/
 KEYWORDS=-* ~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=000721f3e84d627324c7d706791024ff
+_md5_=08e87ed02db549ad455172c0b896f12d
diff --git a/metadata/md5-cache/games-fps/ut2004-3369.3-r1 b/metadata/md5-cache/games-fps/ut2004-3369.3-r1
index 0f77f9321f2e..cfcc9032a8bf 100644
--- a/metadata/md5-cache/games-fps/ut2004-3369.3-r1
+++ b/metadata/md5-cache/games-fps/ut2004-3369.3-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup unpack
 DEPEND=app-arch/p7zip
-DESCRIPTION=Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter
+DESCRIPTION=Editor's Choice Edition plus Mega Pack for the well-known first-person shooter
 EAPI=5
 HOMEPAGE=http://www.unrealtournament2004.com/
 IUSE=dedicated opengl
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://treefort.icculus.org/ut2004/ut2004-lnxpatch3369-2.tar.bz2 http://storage.guntoo.de/downs/downloads/Patch/ut2004-v3369-3-linux-dedicated.7z mirror://gentoo/ut2004-v3369-3-linux-dedicated.7z
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5da73b204da9329de0e24deb47d7f2fe
+_md5_=667853a7c364952dda1928f85b3f4607
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2
index 7863403f355f..378e78db3011 100644
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp1-1-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Community Bonus Pack Volume 1 - UT2003 Community Bonus Pack repacked for UT2004
+DESCRIPTION=UT2004 Community Bonus Pack Vol 1 - UT2003 Community Bonus Pack for UT2004
 EAPI=5
 HOMEPAGE=http://liandri.beyondunreal.com/Unreal_Tournament_2004
 IUSE=dedicated opengl
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6127a6892dfd31c183962c8c2986c102
+_md5_=de49a4de6453b4cbc17e72868482df3a
diff --git a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2 b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2
index fea483458998..3795fbef2d73 100644
--- a/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2
+++ b/metadata/md5-cache/games-fps/ut2004-bonuspack-cbp2-1-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=app-arch/unzip
-DESCRIPTION=UT2004 Community Bonus Pack 2 volumes 1 and 2 - Community Bonus Pack 2 volumes 1 and 2
+DESCRIPTION=UT2004 Community Bonus Pack 2 Vol 1 and 2 - Community Bonus Pack 2 Vol 1 and 2
 EAPI=5
 HOMEPAGE=http://liandri.beyondunreal.com/Unreal_Tournament_2004
 IUSE=dedicated opengl
@@ -11,4 +11,4 @@ RESTRICT=mirror strip
 SLOT=0
 SRC_URI=https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a8989ff99357642f019363b8482979df
+_md5_=87ff8849dd911ade16295f88e298d944
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index a24ae1a32def..b2cc00381582 100644
--- a/metadata/md5-cache/games-kids/Manifest.gz
+++ b/metadata/md5-cache/games-kids/Manifest.gz
diff --git a/metadata/md5-cache/games-kids/gmult-8.0 b/metadata/md5-cache/games-kids/gmult-8.0
index e5b01f8274cd..bbe9823c7815 100644
--- a/metadata/md5-cache/games-kids/gmult-8.0
+++ b/metadata/md5-cache/games-kids/gmult-8.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs
+DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
 EAPI=5
 HOMEPAGE=http://www.mterry.name/gmult/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl games-misc/games-envd
 SLOT=0
 SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd708b75e8e4d32fc3c7743f76ce4a91
+_md5_=159404dff5ea635f1e5a2822362c1f60
diff --git a/metadata/md5-cache/games-kids/gmult-8.0-r1 b/metadata/md5-cache/games-kids/gmult-8.0-r1
index 001e5b9a3938..cee035861cc9 100644
--- a/metadata/md5-cache/games-kids/gmult-8.0-r1
+++ b/metadata/md5-cache/games-kids/gmult-8.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure postinst postrm preinst
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs
+DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
 EAPI=6
 HOMEPAGE=http://www.mterry.name/gmult/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
 SLOT=0
 SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd6d2ed0c0c9022dd70aa650f8de3878
+_md5_=70ea4d905aa8415919fa727c0dae44b9
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 2adf3f06354b..e7909cdc9dca 100644
--- a/metadata/md5-cache/games-misc/Manifest.gz
+++ b/metadata/md5-cache/games-misc/Manifest.gz
diff --git a/metadata/md5-cache/games-misc/bsod-0.1 b/metadata/md5-cache/games-misc/bsod-0.1
index 698b32c99b83..27f77595f8ed 100644
--- a/metadata/md5-cache/games-misc/bsod-0.1
+++ b/metadata/md5-cache/games-misc/bsod-0.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=This program will let you UNIX user experience the authentic microsoft windows experience
+DESCRIPTION=This program will let you experience the authentic Microsoft Windows experience
 EAPI=5
 HOMEPAGE=http://www.vanheusden.com/bsod/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.vanheusden.com/bsod/bsod-0.1.tgz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=41d2e9fe0891ba31fd96a370ce52632e
+_md5_=46246229d17d4245a67e95121d57aa99
diff --git a/metadata/md5-cache/games-misc/bsod-0.1-r1 b/metadata/md5-cache/games-misc/bsod-0.1-r1
index a42dbbbcd7b2..51097266dc17 100644
--- a/metadata/md5-cache/games-misc/bsod-0.1-r1
+++ b/metadata/md5-cache/games-misc/bsod-0.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=This program will let your UNIX user experience the authentic Microsoft Windows experience
+DESCRIPTION=This program will let you experience the authentic Microsoft Windows experience
 EAPI=6
 HOMEPAGE=http://www.vanheusden.com/bsod/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses:0
 SLOT=0
 SRC_URI=http://www.vanheusden.com/bsod/bsod-0.1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bd874215e43139c9246b2799402838b6
+_md5_=d5405dccc23856681db7d085c1936e0b
diff --git a/metadata/md5-cache/games-misc/fortune-mod-simpsons-chalkboard-0.1 b/metadata/md5-cache/games-misc/fortune-mod-simpsons-chalkboard-0.1
index 2992a89f15bb..2740b41c2c42 100644
--- a/metadata/md5-cache/games-misc/fortune-mod-simpsons-chalkboard-0.1
+++ b/metadata/md5-cache/games-misc/fortune-mod-simpsons-chalkboard-0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DESCRIPTION=Quotes from Bart Simpson's Chalkboard, shown at the opening of each Simpsons episode
+DESCRIPTION=Quotes from Bart Simpson's Chalkboard, shown at the opening of Simpsons episode
 EAPI=5
 HOMEPAGE=http://www.splitbrain.org/projects/fortunes/simpsons
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
@@ -8,4 +8,4 @@ RDEPEND=games-misc/fortune-mod
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.splitbrain.org/_media/projects/fortunes/fortune-simpsons-chalkboard.tgz
-_md5_=a8abc330648c222e3c90892dfcfe818e
+_md5_=50664a2d7442aa7a57d221401a15b2ca
diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.3 b/metadata/md5-cache/games-misc/katawa-shoujo-1.3
index 795b86f6b085..9d3f33d3f06f 100644
--- a/metadata/md5-cache/games-misc/katawa-shoujo-1.3
+++ b/metadata/md5-cache/games-misc/katawa-shoujo-1.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children
+DESCRIPTION=Bishoujo-style visual novel by Four Leaf Studios
 EAPI=5
 HOMEPAGE=http://katawa-shoujo.com/
 IUSE=doc +system-renpy
@@ -12,4 +12,4 @@ RESTRICT=!system-renpy? ( strip )
 SLOT=0
 SRC_URI=http://dl.katawa-shoujo.com/gold_1.3/%5b4ls%5d_katawa_shoujo_1.3-%5blinux-x86%5d%5bFCF758CC%5d.tar.bz2 -> katawa-shoujo-1.3.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fee85c8f5372d8b6940cd6836d16213
+_md5_=7ca1034888cc1a36e11d5f413e079fe0
diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1 b/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1
index df40fda1770d..9b3678b693c0 100644
--- a/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1
+++ b/metadata/md5-cache/games-misc/katawa-shoujo-1.3.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm preinst
 DEPEND=>=sys-apps/sed-4
-DESCRIPTION=bishoujo-style visual novel by Four Leaf Studios
+DESCRIPTION=Bishoujo-style visual novel by Four Leaf Studios
 EAPI=5
 HOMEPAGE=http://katawa-shoujo.com/
 IUSE=doc +system-renpy
@@ -12,4 +12,4 @@ RESTRICT=!system-renpy? ( strip )
 SLOT=0
 SRC_URI=http://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> katawa-shoujo-1.3.1.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a2f97d839f4a8baed7254342d264da4
+_md5_=863118c9f58a14fe7761a2505adf867b
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index b6c9797c99f4..022cd1593b1b 100644
--- a/metadata/md5-cache/games-mud/Manifest.gz
+++ b/metadata/md5-cache/games-mud/Manifest.gz
diff --git a/metadata/md5-cache/games-mud/gmudix-1.0 b/metadata/md5-cache/games-mud/gmudix-1.0
index 2fb8b383a54e..007cc24a79fd 100644
--- a/metadata/md5-cache/games-mud/gmudix-1.0
+++ b/metadata/md5-cache/games-mud/gmudix-1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/gtk+:2 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=GTK+ MUD client with ANSI color, macros, timers, triggers, variables, and an easy scripting language
+DESCRIPTION=GTK+ MUD client with many features and an easy scripting language
 EAPI=5
 HOMEPAGE=http://dw.nl.eu.org/mudix.html
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 games-misc/games-envd
 SLOT=0
 SRC_URI=http://dw.nl.eu.org/gmudix/gmudix-1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8653e994221c8c06aba7634ed321b70e
+_md5_=b4dfd8275dff08734afd1553135240c6
diff --git a/metadata/md5-cache/games-mud/gmudix-1.0-r1 b/metadata/md5-cache/games-mud/gmudix-1.0-r1
index 5ea3fc8cd587..e334694b8b64 100644
--- a/metadata/md5-cache/games-mud/gmudix-1.0-r1
+++ b/metadata/md5-cache/games-mud/gmudix-1.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=x11-libs/gtk+:2 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=GTK+ MUD client with ANSI color, macros, timers, triggers, variables, and an easy scripting language
+DESCRIPTION=GTK+ MUD client with many features and an easy scripting language
 EAPI=6
 HOMEPAGE=http://dw.nl.eu.org/mudix.html
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://dw.nl.eu.org/gmudix/gmudix-1.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7a5b8ffccd894703f2021b3ea7a43778
+_md5_=df1eaa7a2197bcab8868e728c3645f11
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index c7daa0e5e37b..d2e341c05f51 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/atomix-3.18.0 b/metadata/md5-cache/games-puzzle/atomix-3.18.0
index c235604e1e09..1d0a0dec27e9 100644
--- a/metadata/md5-cache/games-puzzle/atomix-3.18.0
+++ b/metadata/md5-cache/games-puzzle/atomix-3.18.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 dev-libs/appstream-glib gnome-base/gnome-common >=dev-util/intltool-0.40 sys-devel/gettext 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 >=dev-util/intltool-0.50.2-r1
-DESCRIPTION=a game where you build full molecules, from simple inorganic to extremely complex organic ones
+DESCRIPTION=Build molecules, from simple inorganic to extremely complex organic ones
 EAPI=5
 HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
 IUSE=debug
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/atomix/3.18/atomix-3.18.0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome-games	1c1ce52463a94c92e70fa5ad87126a5f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=319f7063a06cb0c39799a8c0be55d283
+_md5_=e42ec00f500711de8e3a34e0b13a7d9c
diff --git a/metadata/md5-cache/games-puzzle/atomix-3.18.0-r1 b/metadata/md5-cache/games-puzzle/atomix-3.18.0-r1
index b87b39577757..cdf27b33aa4f 100644
--- a/metadata/md5-cache/games-puzzle/atomix-3.18.0-r1
+++ b/metadata/md5-cache/games-puzzle/atomix-3.18.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 dev-libs/appstream-glib >=dev-util/intltool-0.40 gnome-base/gnome-common 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 game where you build full molecules, from simple inorganic to extremely complex organic ones
+DESCRIPTION=Build molecules, from simple inorganic to extremely complex organic ones
 EAPI=6
 HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/atomix/3.18/atomix-3.18.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	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_=082d7acbcdf7ab0b40695ffa7fcf9c3b
+_md5_=3258f5bd66db47001dae2a6106a6000f
diff --git a/metadata/md5-cache/games-puzzle/galaxis-1.8 b/metadata/md5-cache/games-puzzle/galaxis-1.8
index 2691a37f1804..a552a568fd29 100644
--- a/metadata/md5-cache/games-puzzle/galaxis-1.8
+++ b/metadata/md5-cache/games-puzzle/galaxis-1.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=sys-libs/ncurses-5.3:0
-DESCRIPTION=A UNIX-hosted, curses-based clone of the nifty little Macintosh freeware game Galaxis
+DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
 EAPI=5
 HOMEPAGE=http://www.catb.org/~esr/galaxis/
 KEYWORDS=~amd64 ~ppc64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/ncurses-5.3:0 games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9345d012b288dbccd9b00db74363c8d2
+_md5_=2193ed1f81c1ec9c1ac095c5945db73f
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6 b/metadata/md5-cache/games-puzzle/mindless-1.6
index f2e6b2edbbc4..ec983b6b7fe8 100644
--- a/metadata/md5-cache/games-puzzle/mindless-1.6
+++ b/metadata/md5-cache/games-puzzle/mindless-1.6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg virtual/pkgconfig
-DESCRIPTION=play collectable/trading card games (Magic: the Gathering and possibly others) against other people
+DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
 EAPI=5
 HOMEPAGE=http://mindless.sourceforge.net/
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=caeb1d051f4d0fda17509bb8748464d6
+_md5_=7f303a2c81164a70e6cf7bf33560f359
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-9999 b/metadata/md5-cache/games-puzzle/numptyphysics-9999
index 80c39dbd7f84..84dd497d78ce 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 DEPEND=virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A drawing puzzle game in the spirit of Crayon Physics using the same excellent Box2D engine
+DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 EAPI=5
 HOMEPAGE=http://thp.io/2015/numptyphysics/
 IUSE=+user-levels
@@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/s
 SLOT=0
 SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	games	2bb3ede665927a68ffdb7c41eec7efde	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32d573fa26f4beae7078a2a0dd2908e1
+_md5_=d7d0ee8751cdc6a297a23657070a8791
diff --git a/metadata/md5-cache/games-puzzle/tod-0 b/metadata/md5-cache/games-puzzle/tod-0
index f0a248c78809..88144d323452 100644
--- a/metadata/md5-cache/games-puzzle/tod-0
+++ b/metadata/md5-cache/games-puzzle/tod-0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=media-libs/allegro:0[X] app-arch/unzip
-DESCRIPTION=Tetanus On Drugs simulates playing a Tetris clone under the influence of hallucinogenic drugs
+DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
 EAPI=5
 HOMEPAGE=http://www.pineight.com/tod/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=media-libs/allegro:0[X] games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.pineight.com/pc/wintod.zip
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b682b6b001a01e7ad21056c03d5a1a4c
+_md5_=68588c17b753d69d01a1797b43aec180
diff --git a/metadata/md5-cache/games-puzzle/torrent-0.8.2 b/metadata/md5-cache/games-puzzle/torrent-0.8.2
index a9c766f93406..11f1d4c4e3f9 100644
--- a/metadata/md5-cache/games-puzzle/torrent-0.8.2
+++ b/metadata/md5-cache/games-puzzle/torrent-0.8.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
-DESCRIPTION=Match rising tiles to score as many points as possible before the tiles touch the top of the board
+DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
 EAPI=5
 HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-im
 SLOT=0
 SRC_URI=http://www.shiftygames.com/torrent/torrent-0.8.2.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8954476c1f7982cd7191247f2dcc4928
+_md5_=3333e960db05b20854367abd309579fc
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 2998c5313776..a834dd8944cd 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2 b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
index 21eca5d918da..b23d4cd317dd 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.16.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
 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
-DESCRIPTION=Dungeon Crawl Stone Soup is a role-playing roguelike game of exploration and treasure-hunting in dungeons
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
 EAPI=5
 HOMEPAGE=http://crawl.develz.org/wordpress/
 IUSE=debug luajit ncurses test +tiles
@@ -11,4 +11,4 @@ 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_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a7eb012aeac31867894e89f74792f71f
+_md5_=9b50948bcfebca928688936eb0d07fc0
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index c10074eb02b4..3e11358e1f1f 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/bass-1.2-r1 b/metadata/md5-cache/games-rpg/bass-1.2-r1
index 75de7daf0013..5be9f5f3e741 100644
--- a/metadata/md5-cache/games-rpg/bass-1.2-r1
+++ b/metadata/md5-cache/games-rpg/bass-1.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=games-engines/scummvm-0.5.0 app-arch/unzip
-DESCRIPTION=Beneath a Steel Sky: a science fiction thriller set in a bleak vision of the future
+DESCRIPTION=Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future
 EAPI=5
 HOMEPAGE=http://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
 KEYWORDS=~amd64 ~ppc64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=games-engines/scummvm-0.5.0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/scummvm/bass-cd-1.2.zip mirror://gentoo/bass.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e50d0e9df5e9a46e7867a49ce00c3fcc
+_md5_=0f89851ac5e0795da6fdcb47420896bb
diff --git a/metadata/md5-cache/games-rpg/penumbra-collection-1.1 b/metadata/md5-cache/games-rpg/penumbra-collection-1.1
index d51dd0558f76..1fd3f74c145b 100644
--- a/metadata/md5-cache/games-rpg/penumbra-collection-1.1
+++ b/metadata/md5-cache/games-rpg/penumbra-collection-1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile config configure install nofetch postinst postrm preinst prepare setup unpack
 DEPEND=app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Scary first-person adventure game trilogy which focuses on story, immersion and puzzles
+DESCRIPTION=Scary first-person adventure trilogy focussing on story, immersion and puzzles
 EAPI=5
 HOMEPAGE=http://www.penumbragame.com/
 KEYWORDS=-* ~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=PenumbraCollection-1.1.sh
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27cda3ad0835ea340ee7610986b2aab6
+_md5_=7541889a0bb84fa0d70c6ba24b00ff8c
diff --git a/metadata/md5-cache/games-rpg/queen-1 b/metadata/md5-cache/games-rpg/queen-1
index 1b67673c8e43..020e99a00ce3 100644
--- a/metadata/md5-cache/games-rpg/queen-1
+++ b/metadata/md5-cache/games-rpg/queen-1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] ) l10n_de? ( app-arch/unzip ) l10n_en? ( mp3? ( app-arch/unzip ) ) l10n_fr? ( app-arch/unzip ) l10n_he? ( app-arch/unzip ) l10n_it? ( app-arch/unzip )
-DESCRIPTION=Flight of the Amazon Queen - a 2D point-and-click adventure game set in the 1940s
+DESCRIPTION=Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s
 EAPI=5
 HOMEPAGE=http://scummvm.sourceforge.net/
 IUSE=mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )
 SLOT=0
 SRC_URI=l10n_de? ( mirror://sourceforge/scummvm/FOTAQ_Ger_talkie-1.0.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_en? ( mp3? ( mirror://sourceforge/scummvm/FOTAQ_Talkie-1.1.zip ) !mp3? ( http://www.lysator.liu.se/~zino/scummvm/queen/queen.1.bz2 http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) ) l10n_fr? ( mirror://sourceforge/scummvm/FOTAQ_Fr_Talkie_1.0.zip ) l10n_he? ( mirror://sourceforge/scummvm/FOTAQ_Heb_talkie.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_it? ( mirror://sourceforge/scummvm/FOTAQ_It_Talkie_1.0.zip ) http://www.scummvm.org/images/cat-queen.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c4ca828c09d0b5aaabfa5b0ab86630c6
+_md5_=daac662093d949fc97eba4dc691634a6
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index b7f9397a3ebf..d0304879125f 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
 DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Indie Adventure RPG, two doctors traversing the memories of a dying man to fulfill his last wish
+DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
 EAPI=5
 HOMEPAGE=http://freebirdgames.com/games/to-the-moon
 IUSE=bundled-libs
@@ -11,4 +11,4 @@ RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=ToTheMoon_linux_1389114090.sh
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46876ef620bfaaae22c2bbfe722d488e
+_md5_=c7a3717724637ef1e92dee8278c882c9
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
index 0408137f4eb9..f98d7530292a 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
 DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Direct sequel to 1988's Wasteland, the first-ever post-apocalyptic computer RPG and the inspiration behind the Fallout series
+DESCRIPTION=Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
 EAPI=5
 HOMEPAGE=https://wasteland.inxile-entertainment.com/
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RESTRICT=bindist fetch mirror
 SLOT=0
 SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3b4da0fdc9aa0a43c80bb62949e871f2
+_md5_=59d5f4594800a80ee26d0c8a165a76ef
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index a122b9495dba..c8a325dc1179 100644
--- a/metadata/md5-cache/games-simulation/Manifest.gz
+++ b/metadata/md5-cache/games-simulation/Manifest.gz
diff --git a/metadata/md5-cache/games-simulation/singularity-0.30c-r1 b/metadata/md5-cache/games-simulation/singularity-0.30c-r1
index 1f8e2d8868a7..a922370089b5 100644
--- a/metadata/md5-cache/games-simulation/singularity-0.30c-r1
+++ b/metadata/md5-cache/games-simulation/singularity-0.30c-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 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(+)] app-arch/unzip
-DESCRIPTION=A simulation of a true AI. Go from computer to computer, pursued by the entire world
+DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
 EAPI=5
 HOMEPAGE=http://www.emhsoft.com/singularity/
 IUSE=+music python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://endgame-singularity.googlecode.com/files/singularity-0.30c-src.tar.gz music? ( https://endgame-singularity.googlecode.com/files/endgame-singularity-music-006.zip )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=5dfb80a6e9d6bfcfb1037c38e7dc4015
+_md5_=a2fc3df47bd48673b3ead488b2cc28c8
diff --git a/metadata/md5-cache/games-simulation/singularity-0.30c-r2 b/metadata/md5-cache/games-simulation/singularity-0.30c-r2
index 9315cfd657ba..94f09c255dea 100644
--- a/metadata/md5-cache/games-simulation/singularity-0.30c-r2
+++ b/metadata/md5-cache/games-simulation/singularity-0.30c-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install 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(+)] app-arch/unzip
-DESCRIPTION=A simulation of a true AI. Go from computer to computer, pursued by the entire world
+DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
 EAPI=6
 HOMEPAGE=http://www.emhsoft.com/singularity/
 IUSE=+music python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://endgame-singularity.googlecode.com/files/singularity-0.30c-src.tar.gz music? ( https://endgame-singularity.googlecode.com/files/endgame-singularity-music-006.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=25e13066a40c16e76aacc7f8fc0bfc2d
+_md5_=121458a1beaaaae4072cd4e553b07334
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 7335d993b482..525effd167a8 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2 b/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
index af42887a0224..7fa6a58b8c62 100644
--- a/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
+++ b/metadata/md5-cache/games-strategy/heroes3-1.3.1a-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND==dev-util/xdelta-1* games-util/loki_patch
-DESCRIPTION=Heroes of Might and Magic III : The Restoration of Erathia - turn-based 2-D medieval combat
+DESCRIPTION=Heroes of Might and Magic III: The Restoration of Erathia
 EAPI=5
 HOMEPAGE=http://www.lokigames.com/products/heroes3/
 IUSE=nocd maps music sounds videos
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=x86? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) amd64? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) ppc? ( mirror://lokigames/heroes3/heroes3-1.3.1a-ppc.run )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	593beee21fc1247ccf32244f399982a7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=219551d4b4e7c5d272ee414219b65ff2
+_md5_=491f821945f5c93f12ff0187b305461d
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 15b3fbae848e..1b06dace4378 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/exim-4.89-r5 b/metadata/md5-cache/mail-mta/exim-4.89-r5
index 062f689b92fd..99ffa872217c 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89-r5
+++ b/metadata/md5-cache/mail-mta/exim-4.89-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X elibc_glibc
-KEYWORDS=alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.89.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-pdf-4.89.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=20d84708dd2a2cfb468a2cc587c2cf84
+_md5_=0f25dec73c26a24e3b5401508ad0a87c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 36ab38441f16..ee644cd52ebb 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
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 7aad917b8ceb..d53f4c9fd23b 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_=247f10a3788df3fa223d3f2b92edf7ea
+_md5_=d0a3c0d6792511b304b3f8df996f1c0a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index a7e29be69c3a..b454b2411024 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/grip-3.4.3 b/metadata/md5-cache/media-sound/grip-3.4.3
index 3f290380be08..7673943c2ac0 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=82e1d9ba1c810ff7deddaff9016e3b70
+_md5_=f1427579919f261ddc6c0bdd0255ced2
diff --git a/metadata/md5-cache/media-sound/grip-3.6.2 b/metadata/md5-cache/media-sound/grip-3.6.2
new file mode 100644
index 000000000000..df1cd595444b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/grip-3.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=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 ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422
+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
+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.6.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e1965920283064073f1a9f991de0a6cd
diff --git a/metadata/md5-cache/media-sound/shntool-3.0.10-r1 b/metadata/md5-cache/media-sound/shntool-3.0.10-r1
index 4a668d0bcfee..a1198721a74d 100644
--- a/metadata/md5-cache/media-sound/shntool-3.0.10-r1
+++ b/metadata/md5-cache/media-sound/shntool-3.0.10-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure
 DEPEND=flac? ( media-libs/flac ) mac? ( media-sound/mac ) sox? ( media-sound/sox ) alac? ( media-sound/alac_decoder ) shorten? ( media-sound/shorten ) wavpack? ( media-sound/wavpack )
 DESCRIPTION=A multi-purpose WAVE data processing and reporting utility
 EAPI=4
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=flac? ( media-libs/flac ) mac? ( media-sound/mac ) sox? ( media-sound/sox ) alac? ( media-sound/alac_decoder ) shorten? ( media-sound/shorten ) wavpack? ( media-sound/wavpack )
 SLOT=0
 SRC_URI=http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz
-_md5_=eb3929503bd1666a01b72d1cf1f6420f
+_md5_=87f6791485a5ad92a011c2b527200186
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
index 81b8c699cb93..0e0386083ee1 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.linux-apps.com/search?projectSearchText=soundKonverter http
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 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 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=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/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 !media-sound/soundkonverter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.37.0:5 kde-frameworks/oxygen-icons:* ) >=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	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	a979463dcce77e632a3dd7b92be69e67	kde5-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
+_md5_=66f1c2bd3c6010ecf3bbe46a9e0f694d
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index f1f6ccbd6074..c6c1dbe1b6a0 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.5.5-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.5.5-r1
index d08b23810c16..ad0279b8333d 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.5.5-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.5.5-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.5.5 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f922b8060f0d4d465ccdf0d47985e175
+_md5_=2dad8e27d0193e65a4e68a204b145f9a
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
index 458eeae19187..d9e4f22b1908 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
-KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.6.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0/8.0.0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=86947832e69d07c28eb95b262ea0680d
+_md5_=e642d81cb2c106c3897c41037a739a20
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
index 51f680153336..80025476825d 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.0
@@ -4,7 +4,7 @@ DESCRIPTION=A system to store and display time-series data
 EAPI=6
 HOMEPAGE=http://oss.oetiker.ch/rrdtool/
 IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_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 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) 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(+)?] ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_
 SLOT=0/8.0.0
 SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c2f64cdc9142897859a9c14cae9eafc
+_md5_=983ef2548cd67d068218f547a5c2738d
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.2.7 b/metadata/md5-cache/net-analyzer/wireshark-2.2.7
index dcdf1b4a7a9d..d7fb3ebe4c7f 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.2.7
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.2.7
@@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=6
 HOMEPAGE=https://www.wireshark.org/
 IUSE=adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi libssh randpkt randpktdump sshdump ssl tfshark zlib +filecaps
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) 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 ) lua? ( >=dev-lang/lua-5.1:* ) 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 ) 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 ) ssl? ( crypt )
 SLOT=0/2.2.7
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.2.7.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=778dfa584a62ba87145971ab45670137
+_md5_=4784bf09514f09cc10682a9956e3288f
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.3 b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
new file mode 100644
index 000000000000..089b0ccab965
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=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 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) 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 filecaps? ( sys-libs/libcap ) >=sys-apps/sed-4
+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 ~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.3
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.3.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac2abba94ead4acca35de4e6979a2071
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fb07b6d41800..caf9776404c5 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/pdns-4.0.5 b/metadata/md5-cache/net-dns/pdns-4.0.5
index 637ce207b98f..2be54960df7c 100644
--- a/metadata/md5-cache/net-dns/pdns-4.0.5
+++ b/metadata/md5-cache/net-dns/pdns-4.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=The PowerDNS Daemon
 EAPI=6
 HOMEPAGE=https://www.powerdns.com/
 IUSE=botan debug doc geoip ldap libressl lua luajit mydns mysql opendbx postgres protobuf remote sqlite systemd tools tinydns test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:= ) >=dev-libs/boost-1.35:= botan? ( dev-libs/botan:2= ) lua? ( dev-lang/lua:= ) luajit? ( dev-lang/luajit:= ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) opendbx? ( dev-db/opendbx ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip ) tinydns? ( >=dev-db/tinycdb-0.77 ) protobuf? ( dev-libs/protobuf )
 REQUIRED_USE=mydns? ( mysql ) ?? ( lua luajit )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.0.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6ed3e28def01058db05f39e3ffa21ab4
+_md5_=3a645e6a68f23c3b4ba3cc100677b785
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b1e394c654e9..abb67204e150 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/chrony-3.1 b/metadata/md5-cache/net-misc/chrony-3.1
index c3c3388090b6..f483075e7a9e 100644
--- a/metadata/md5-cache/net-misc/chrony-3.1
+++ b/metadata/md5-cache/net-misc/chrony-3.1
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
 EAPI=6
 HOMEPAGE=http://chrony.tuxfamily.org/
 IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
-KEYWORDS=~alpha ~amd64 arm hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha ~amd64 arm hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
 REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2ff541603d29ceac5357a8c06c2e96c6
+_md5_=9217cedbeae3b9c240cbf98d79fabad2
diff --git a/metadata/md5-cache/net-misc/curl-7.57.0 b/metadata/md5-cache/net-misc/curl-7.57.0
index 448d213d7cfd..3945ed180de0 100644
--- a/metadata/md5-cache/net-misc/curl-7.57.0
+++ b/metadata/md5-cache/net-misc/curl-7.57.0
@@ -4,7 +4,7 @@ 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-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=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 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.57.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a552a21cf296e6f4bc299ee8e7a49ee4
+_md5_=3658782851e587b5811d6ec141e8e614
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.2 b/metadata/md5-cache/net-misc/quagga-1.2.2
index 56c6e9c5ac6e..ac6ef658cd58 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.2
+++ b/metadata/md5-cache/net-misc/quagga-1.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=6
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-libs/protobuf-c:0= ) readline? ( sys-libs/readline:0= pam? ( sys-libs/pam ) ) snmp? ( net-analyzer/net-snmp ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2 kernel_linux? ( virtual/tmpfiles )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.2.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	34815d3b76e745c5ca33eec9f95074c2	tmpfiles	1e504fdcf4f24aeded1ce42600307f76	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9dcc447836c180ddf2e5bbef282b0dfa
+_md5_=25da2324271db0c0206b5ed9024a50f3
diff --git a/metadata/md5-cache/net-misc/unison-2.48.4 b/metadata/md5-cache/net-misc/unison-2.48.4
index 601a61dad983..3690d2a912a7 100644
--- a/metadata/md5-cache/net-misc/unison-2.48.4
+++ b/metadata/md5-cache/net-misc/unison-2.48.4
@@ -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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2bcc19b597d78ff86d68dfbad29c14f0
+_md5_=fbe49a317930a3829ecb2673a8b74d53
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 8b3144fa33ba..3660746d40d2 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
new file mode 100644
index 000000000000..2f15f90f53b8
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=6
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+SLOT=0/2018.9999
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19ce149cec8b7da6545d6175fa517c2f
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018_beta1 b/metadata/md5-cache/sci-chemistry/gromacs-2018_beta1
new file mode 100644
index 000000000000..26a7058f7e15
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018_beta1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.7.2
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=6
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack )
+SLOT=0/2018_beta1
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018-beta1.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2018-beta1.tar.gz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	cuda	626969678b9c5735753d8a380c6f295b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=82669d558935beb971ab267ace7aff33
diff --git a/metadata/md5-cache/sci-chemistry/gsim-21.3 b/metadata/md5-cache/sci-chemistry/gsim-21.3
index 759dcff29207..19d93d69e844 100644
--- a/metadata/md5-cache/sci-chemistry/gsim-21.3
+++ b/metadata/md5-cache/sci-chemistry/gsim-21.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare unpack
 DEPEND=dev-cpp/muParser media-libs/freetype sci-libs/libcmatrix sci-libs/minuit virtual/blas dev-qt/qtsvg:4 emf? ( media-libs/libemf ) opengl? ( dev-qt/qtopengl:4 ) virtual/pkgconfig
-DESCRIPTION=Programm for visualisation and processing of experimental and simulated NMR spectra
+DESCRIPTION=Visualisation and processing of experimental and simulated NMR spectra
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/gsim/
 IUSE=emf opengl
@@ -10,4 +10,4 @@ RDEPEND=dev-cpp/muParser media-libs/freetype sci-libs/libcmatrix sci-libs/minuit
 SLOT=0
 SRC_URI=mirror://sourceforge/gsim/gsim-21.3.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=952b237476b1e3b1d25e73077cf5ea4f
+_md5_=8b4d9903ad01081c70ba10643f5542c2
diff --git a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2 b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
index ed9a6fa4be02..a8df443ea8d9 100644
--- a/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
+++ b/metadata/md5-cache/sci-chemistry/molscript-2.1.2-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install nofetch prepare
 DEPEND=media-libs/freeglut media-libs/gd:2= media-libs/libpng:0= virtual/jpeg:0= || ( x11-libs/libXmu x11-libs/libXext x11-libs/libX11 )
-DESCRIPTION=Display molecular 3D structures, such as proteins, in both schematic and detailed representations
+DESCRIPTION=Display 3D molecules (e.g., proteins) in schematic and detailed representations
 EAPI=5
 HOMEPAGE=http://www.avatar.se/molscript/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
@@ -10,4 +10,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=molscript-2.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=eb0013ea21e1b6460673297657b6c433
+_md5_=c1991e872be752de44194c5a181e2c17
diff --git a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1 b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
index 88440e2ee383..a1445c85c406 100644
--- a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
+++ b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install nofetch
-DESCRIPTION=MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces
+DESCRIPTION=MSMS very efficiently computes triangulations of Solvent Excluded Surfaces
 EAPI=4
 HOMEPAGE=http://mgl.scripps.edu/people/sanner/html/msms_home.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=MSMS
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( msms_i86_64Linux2_2.6.1.tar.gz ) x86? ( msms_i86Linux2_2.6.1.tar.gz )
-_md5_=3bed25085e21d3be0ead51b25101c70b
+_md5_=c43ab98fd504ae15a5c6f4c778ac6daf
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
index bac05d02bb1e..a95afee35b8a 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare setup
 DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_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_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] virtual/fortran
-DESCRIPTION=Tools for manipulating and doing calculations on wwPDB macromolecule structure files
+DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
 IUSE=python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) pyt
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1351edf19d2820e89574c5ff43489439
+_md5_=65e79ac4a3cfe79480b4076c8296ae6d
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
index 1c0ee81b63b4..8fcc574fa7e1 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install 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(+)] virtual/fortran
-DESCRIPTION=Tools for manipulating and doing calculations on wwPDB macromolecule structure files
+DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f9f71182abfaac381b3fc033e7a068f5
+_md5_=6829f5fae8d0bf0ffdef84abe46217bb
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
index 9322149a9eeb..2559d31ca2e3 100644
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/openbabel-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdb2pka? ( sci-chemistry/apbs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),-mpi] ) dev-lang/swig:0 dev-util/scons virtual/fortran
-DESCRIPTION=An automated pipeline for performing Poisson-Boltzmann electrostatics calculations
+DESCRIPTION=Automated pipeline for performing Poisson-Boltzmann electrostatics calculations
 EAPI=5
 HOMEPAGE=http://www.poissonboltzmann.org/
 IUSE=doc examples opal +pdb2pka python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=277a039f856ae0c68d6abceb12d4badc
+_md5_=787e26e15fbbe6ccc3debd3915e303dc
diff --git a/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504 b/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
index 9c683bfa0359..c86bbcb16707 100644
--- a/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
+++ b/metadata/md5-cache/sci-chemistry/pdbcns-2.0.010504
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DESCRIPTION=Convert atom names for common amino acids and nucleic acid bases from PDB format to CNS or back
+DESCRIPTION=Convert atom names for amino acids/nucleic acid bases between PDB and CNS format
 EAPI=4
 HOMEPAGE=http://www.mybiosoftware.com/3d-molecular-model/314/
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pdbcns.2.0.010504.perl.tgz
-_md5_=f167b7636f3008d03c5b5a4fa27d414e
+_md5_=89c30d46542bd1560e7c844043f6096c
diff --git a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1 b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
index 4effb4f82fc0..49816abdda1b 100644
--- a/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
+++ b/metadata/md5-cache/sci-chemistry/prekin-6.51.081122-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libX11 x11-libs/libXt X? ( >=x11-libs/motif-2.3:0 )
-DESCRIPTION=Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files
+DESCRIPTION=Prepares molecular kinemages from PDB-format coordinate files
 EAPI=2
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/prekin.php
 IUSE=X
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXext x11-libs/libXmu x11-libs/libX11 x11-libs/libXt X? ( >=x
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/prekin/prekin.6.51.081122.src.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=74da56bfd665dc0e2e02f09683a31550
+_md5_=b00f4c87d6c7171e4ba9e2ca6780b506
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511 b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
index 702a6576a73b..0ce95470c991 100644
--- a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
+++ b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Prediction of the pKa values of ionizable groups in proteins and protein-ligand complexes
+DESCRIPTION=pKa-value prediction of ionizable groups in protein and protein-ligand complexes
 EAPI=5
 HOMEPAGE=http://propka.ki.ku.dk/
 IUSE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/propka-3.1_p140511.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ebb8e38b8268a314f0aedc878dc74b59
+_md5_=77a50416f48bdac3be53689262fbd770
diff --git a/metadata/md5-cache/sci-chemistry/shelx-20141228 b/metadata/md5-cache/sci-chemistry/shelx-20141228
index 5d7b51cf6f2c..b71ccc3b10ab 100644
--- a/metadata/md5-cache/sci-chemistry/shelx-20141228
+++ b/metadata/md5-cache/sci-chemistry/shelx-20141228
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install nofetch
-DESCRIPTION=Programs for crystal structure determination from single-crystal diffraction data
+DESCRIPTION=Crystal structure determination from single-crystal diffraction data
 EAPI=5
 HOMEPAGE=http://shelx.uni-ac.gwdg.de/SHELX/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=free-noncomm
 RESTRICT=fetch
 SLOT=0
 SRC_URI=amd64? ( anode_amd64.bz2 ciftab_amd64.bz2 shelxc_amd64.bz2 shelxd_amd64.bz2 shelxe_amd64.bz2 shelxl_amd64.bz2 shelxs_amd64.bz2 shelxt_amd64.bz2 shredcif_amd64.bz2 ) x86? ( anode_x86.bz2 ciftab_x86.bz2 shelxc_x86.bz2 shelxd_x86.bz2 shelxe_x86.bz2 shelxl_x86.bz2 shelxs_x86.bz2 shelxt_x86.bz2 shredcif_x86.bz2 )
-_md5_=b66443b048e30f88389ac6ad4c1ca172
+_md5_=b169253fd8af7308865dff74b5225d8f
diff --git a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628 b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
index b62102b3dcad..455fc88379d5 100644
--- a/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
+++ b/metadata/md5-cache/sci-chemistry/suitename-0.3.070628
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare
-DESCRIPTION=The ROC RNA Ontology Consortium consensus RNA backbone nomenclature and conformer-list development
+DESCRIPTION=The ROC RNA Ontology nomenclature and conformer-list development
 EAPI=4
 HOMEPAGE=http://kinemage.biochem.duke.edu/software/suitename.php
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -7,4 +7,4 @@ LICENSE=richardson
 SLOT=0
 SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/suitename/suitename.0.3.070628.src.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f3751bdbdbce7b48ea8c66ac68009342
+_md5_=23e3046482e340a86f5452a8901c8c44
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index e9b33c1ce00b..e2188e79c6dd 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/electric-8.09 b/metadata/md5-cache/sci-electronics/electric-8.09
index 2ec0bacdab88..7ff065c2a093 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.09
+++ b/metadata/md5-cache/sci-electronics/electric-8.09
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.09.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=772fde64e5190e7595aedde68d80d6ad
+_md5_=c65264dc7de171fb1bf1c3c4fdbb5620
diff --git a/metadata/md5-cache/sci-electronics/electric-8.11 b/metadata/md5-cache/sci-electronics/electric-8.11
index b8170bf3070b..3051f8a82b14 100644
--- a/metadata/md5-cache/sci-electronics/electric-8.11
+++ b/metadata/md5-cache/sci-electronics/electric-8.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-8.11.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fe5480885b128f3e8d01ff6dd9def59
+_md5_=7f40ec0874183011e6c6e755d4fe4105
diff --git a/metadata/md5-cache/sci-electronics/electric-9.02 b/metadata/md5-cache/sci-electronics/electric-9.02
index a9bd4a20a588..dbf50789d375 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.02
+++ b/metadata/md5-cache/sci-electronics/electric-9.02
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.02.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=772fde64e5190e7595aedde68d80d6ad
+_md5_=c65264dc7de171fb1bf1c3c4fdbb5620
diff --git a/metadata/md5-cache/sci-electronics/electric-9.03 b/metadata/md5-cache/sci-electronics/electric-9.03
index df17e3eeddd1..2675db86bf99 100644
--- a/metadata/md5-cache/sci-electronics/electric-9.03
+++ b/metadata/md5-cache/sci-electronics/electric-9.03
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install preinst setup
 DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design
+DESCRIPTION=Complete Electronic Design Automation system for many forms of circuit design
 EAPI=0
 HOMEPAGE=https://www.gnu.org/software/electric/electric.html
 IUSE=elibc_FreeBSD
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.6 sci-electronics/electronics-menu >=dev-java/java-confi
 SLOT=0
 SRC_URI=mirror://gnu/electric/electricBinary-9.03.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9fe5480885b128f3e8d01ff6dd9def59
+_md5_=7f40ec0874183011e6c6e755d4fe4105
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1 b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
index 11d9922071d1..b942cd35933f 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
+++ b/metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/libgnome >=gnome-base/libgnomeui-2.12 >=gnome-base/libgnomecanvas-2.12 >=x11-libs/cairo-1.2 x11-libs/gtksourceview:2.0 >=dev-util/scons-0.96.1 virtual/pkgconfig dev-util/scons
-DESCRIPTION=Oregano is an application for schematic capture and simulation of electrical circuits
+DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=5
 HOMEPAGE=http://oregano.gforge.lug.fi.uba.ar/
 KEYWORDS=amd64 ~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-base/li
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/oregano/oregano_0.69.1.orig.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ae9e785d7d62f2db4b3c09591d495b8d
+_md5_=84990bb942c376fc2651ca4f694e7682
diff --git a/metadata/md5-cache/sci-electronics/oregano-0.82 b/metadata/md5-cache/sci-electronics/oregano-0.82
index 42c6adf43b93..6a9e39f5e301 100644
--- a/metadata/md5-cache/sci-electronics/oregano-0.82
+++ b/metadata/md5-cache/sci-electronics/oregano-0.82
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
 DEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtksourceview:3.0 app-text/rarian 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 >=sys-apps/sed-4
-DESCRIPTION=Oregano is an application for schematic capture and simulation of electrical circuits
+DESCRIPTION=Application for the schematic capturing and simulation of electrical circuits
 EAPI=4
 HOMEPAGE=https://github.com/marc-lorber/oregano
 KEYWORDS=~amd64 ~ppc ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 x11-libs/gtkso
 SLOT=0
 SRC_URI=https://github.com/marc-lorber/oregano/tarball/v0.82 -> oregano-0.82.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=98bb621fa701fa44de29639a8f4775ca
+_md5_=fad5c5af074ea6cce14766190c0dc504
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 5f2c617aaed1..5496b56c888a 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index 2b102ec966ba..306c008da2a4 100644
--- a/metadata/md5-cache/sci-libs/bmrblib-1.0.3
+++ b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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(-)]
-DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format (http://www.bmrb.wisc.edu/)
+DESCRIPTION=API abstracting the BioMagResBank (BMRB) NMR-STAR format
 EAPI=5
 HOMEPAGE=http://gna.org/projects/bmrblib/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=http://download.gna.org/bmrblib/bmrblib-1.0.3.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5a4d601926efbdd8004e1c13febe5ad
+_md5_=44ccc75f29658573371c505cb63cff23
diff --git a/metadata/md5-cache/sci-libs/inchi-1.04 b/metadata/md5-cache/sci-libs/inchi-1.04
index 2d8663155b03..f4918126535c 100644
--- a/metadata/md5-cache/sci-libs/inchi-1.04
+++ b/metadata/md5-cache/sci-libs/inchi-1.04
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=app-arch/unzip
-DESCRIPTION=A program and library for generating standard and non-standard InChI and InChIKeys
+DESCRIPTION=Program and library for generating standard and non-standard InChI and InChIKeys
 EAPI=5
 HOMEPAGE=http://www.iupac.org/inchi/
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=IUPAC-InChi
 SLOT=0
 SRC_URI=http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-API.ZIP -> inchi-1.04.zip doc? ( http://www.inchi-trust.org/sites/default/files/inchi-1.04/INCHI-1-DOC.ZIP -> inchi-1.04-doc.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d2c5c06e117e2e82a4448f3e350ec364
+_md5_=fab5b17db74d0d978ea9604c7546b235
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.0.079 b/metadata/md5-cache/sci-libs/ipp-7.1.0.079
index 036413cd8b28..4fcc9b4b295c 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.0.079
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.0.079
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=4
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2749/parallel_studio_xe_2013_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c08269a40c3c71cda50f7c829f5c13f7
+_md5_=804f63a052d45056f2ce69c30079d629
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.117 b/metadata/md5-cache/sci-libs/ipp-7.1.1.117
index f9589d2a240f..7dfd92739b4f 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.117
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.117
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=4
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2872/parallel_studio_xe_2013_update1_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c256d2825801df2a5a1f9ba16d211897
+_md5_=b4c746cdac8bba8e1bd076fe5624a740
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.146 b/metadata/md5-cache/sci-libs/ipp-7.1.1.146
index c690726daf32..4d775fa2c004 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.146
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.146
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/2987/parallel_studio_xe_2013_update2_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3f7ad1e8f3b9654231d51749651b8ad8
+_md5_=78a5c7e10d652e3d5488ed9f90215bf5
diff --git a/metadata/md5-cache/sci-libs/ipp-7.1.1.192 b/metadata/md5-cache/sci-libs/ipp-7.1.1.192
index 8ab4ed0be854..d936d3c55c09 100644
--- a/metadata/md5-cache/sci-libs/ipp-7.1.1.192
+++ b/metadata/md5-cache/sci-libs/ipp-7.1.1.192
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=amd64? ( multilib? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4.tgz ) ) amd64? ( !multilib? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4_intel64.tgz ) ) x86? ( http://registrationcenter-download.intel.com/irc_nas/3266/parallel_studio_xe_2013_update4_ia32.tgz )
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=160669063901cc85d8dd7fbc28b809bf
+_md5_=b515dae8f5745206682be3611a8addb0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.0.1.080 b/metadata/md5-cache/sci-libs/ipp-8.0.1.080
index 90f234255941..7d3a18b4e915 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.0.1.080
+++ b/metadata/md5-cache/sci-libs/ipp-8.0.1.080
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/3447/parallel_studio_xe_2013_sp1.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1de8077cf3307d26dc6d6edc73a5bd01
+_md5_=18078b3285ef43bfc163dc86dd017ded
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.0.090 b/metadata/md5-cache/sci-libs/ipp-8.2.0.090
index 638a5cbad24d..135a645b22e9 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.0.090
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.0.090
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/4584/parallel_studio_xe_2015.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=cc326214dbecc2273ed6d2e9421e9a82
+_md5_=b719b04ff10e6dacb102d19685dc87f0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.1.164 b/metadata/md5-cache/sci-libs/ipp-8.2.1.164
index bc6dfa5cc079..5cc8b45f1d61 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.1.164
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.1.164
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/5207/parallel_studio_xe_2015_update2.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=51627563df245ed401430b3159bc02c3
+_md5_=3f6732aa3deab886118a43617a209bf0
diff --git a/metadata/md5-cache/sci-libs/ipp-8.2.2.187 b/metadata/md5-cache/sci-libs/ipp-8.2.2.187
index bfd5a722d70e..c6642408745b 100644
--- a/metadata/md5-cache/sci-libs/ipp-8.2.2.187
+++ b/metadata/md5-cache/sci-libs/ipp-8.2.2.187
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm pretend setup unpack
 DEPEND=app-arch/rpm2targz
-DESCRIPTION=Intel Integrated Performance Primitive library for multimedia and data processing
+DESCRIPTION=Intel Integrated Performance Primitives for multimedia and data processing
 EAPI=5
 HOMEPAGE=http://software.intel.com/en-us/articles/intel-ipp/
 IUSE=examples multilib
@@ -11,4 +11,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=http://registrationcenter-download.intel.com/irc_nas/7538/parallel_studio_xe_2015_update3.tgz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	intel-sdp	ae5121093dd6e6c556120484470e022c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=90eb5c19fb540bf3e1356156e09867a3
+_md5_=c207bb78026a7aad92534497dce065c6
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.3 b/metadata/md5-cache/sci-libs/libcerf-1.3
index 749277833132..ed7066456526 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.3
+++ b/metadata/md5-cache/sci-libs/libcerf-1.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=library that provides an efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.3.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=819d810467516a6ded57ee8c12652987
+_md5_=e87b69a8b4fd8309a8c99981efa3a681
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.4 b/metadata/md5-cache/sci-libs/libcerf-1.4
index 3391b0896bab..ad203667ddae 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.4
+++ b/metadata/md5-cache/sci-libs/libcerf-1.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=library that provides an efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.4.tgz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0325c18bcb9e969465ae070d90d000a0
+_md5_=cdc3912fa9dff7e7885200906c3ddfc5
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.5 b/metadata/md5-cache/sci-libs/libcerf-1.5
index 0f1d301b3fac..ca64c1588aad 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.5
+++ b/metadata/md5-cache/sci-libs/libcerf-1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install
-DESCRIPTION=efficient and accurate implementation of complex error functions
+DESCRIPTION=Efficient and accurate implementation of complex error functions
 EAPI=6
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
@@ -7,4 +7,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz
-_md5_=e3532cdf3c735c9e90f9e579b836ff67
+_md5_=96c9c8cb652c82dec0e7fd1f77ebb515
diff --git a/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1 b/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
index 31e33622da34..97e1fd06a852 100644
--- a/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
+++ b/metadata/md5-cache/sci-libs/mmdb-1.25.5-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=The Coordinate Library, designed to assist CCP4 developers in working with coordinate files
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
 EAPI=5
 HOMEPAGE=https://launchpad.net/mmdb/
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-3
 SLOT=0
 SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb-1.25.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fe794a1ac987742b8df2f06108af988a
+_md5_=20ad17298c2203b0d1a9205b768ed8f0
diff --git a/metadata/md5-cache/sci-libs/mmdb-2.0.1 b/metadata/md5-cache/sci-libs/mmdb-2.0.1
index c27e2a6b5da8..2669ff98e4d9 100644
--- a/metadata/md5-cache/sci-libs/mmdb-2.0.1
+++ b/metadata/md5-cache/sci-libs/mmdb-2.0.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-portage/elt-patches-20170422
-DESCRIPTION=The Coordinate Library, designed to assist CCP4 developers in working with coordinate files
+DESCRIPTION=The Coordinate Library for working with CCP4 coordinate files
 EAPI=5
 HOMEPAGE=https://launchpad.net/mmdb/
 IUSE=static-libs
@@ -9,4 +9,4 @@ LICENSE=GPL-2 LGPL-3
 SLOT=2
 SRC_URI=ftp://ftp.ccp4.ac.uk/opensource/mmdb2-2.0.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=862f7269d59fb6173a97367e8d729f4d
+_md5_=0833867713e000eedd683494f5b125ab
diff --git a/metadata/md5-cache/sci-libs/pymmlib-1.2.1 b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
index 8bb2f3c08b33..48861a53627c 100644
--- a/metadata/md5-cache/sci-libs/pymmlib-1.2.1
+++ b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtkglext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut virtual/glu virtual/opengl x11-libs/libXmu doc? ( dev-python/epydoc[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=Toolkit and library for the analysis and manipulation of macromolecular structural models
+DESCRIPTION=Toolkit and library for the analysis and manipulation of macromolecular models
 EAPI=5
 HOMEPAGE=http://pymmlib.sourceforge.net/
 IUSE=doc python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://github/masci/mmLib/pymmlib-1.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c25fea18d56c308b3ccbb216626d9c6
+_md5_=44fa7a29c2c139ded173740e4b87fda2
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index eff50998a661..e859e5489e50 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2 b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
index 4519b45e0bff..4cbcaea1209a 100644
--- a/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
+++ b/metadata/md5-cache/sys-apps/arrayprobe-2.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=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=CLI utility that reports the status of a HP (Compaq) array controller (both IDA & CCISS supported)
+DESCRIPTION=Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)
 EAPI=4
 HOMEPAGE=http://www.strocamp.net/opensource/arrayprobe.php
 KEYWORDS=amd64 ~ia64 x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.strocamp.net/opensource/compaq/downloads/arrayprobe-2.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e1bc06d641c79d47d70dbe1d8da7bdd9
+_md5_=6c667b89c0c01885e085a3c74a02657b
diff --git a/metadata/md5-cache/sys-apps/collectl-3.7.4 b/metadata/md5-cache/sys-apps/collectl-3.7.4
index 774b4d307d18..254bd61f126d 100644
--- a/metadata/md5-cache/sys-apps/collectl-3.7.4
+++ b/metadata/md5-cache/sys-apps/collectl-3.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DESCRIPTION=light-weight performance monitoring tool capable of reporting interactively and logging to disk
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=4
 HOMEPAGE=http://collectl.sourceforge.net/
 KEYWORDS=alpha amd64 ia64 x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-3.7.4.src.tar.gz
-_md5_=cfd1223e1597b20d28a909bfac5806aa
+_md5_=037f5417328479cd132fb7265f00223a
diff --git a/metadata/md5-cache/sys-apps/collectl-4.0.5 b/metadata/md5-cache/sys-apps/collectl-4.0.5
index 7caf4d526ea3..459fa29f44af 100644
--- a/metadata/md5-cache/sys-apps/collectl-4.0.5
+++ b/metadata/md5-cache/sys-apps/collectl-4.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DESCRIPTION=light-weight performance monitoring tool capable of reporting interactively and logging to disk
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=5
 HOMEPAGE=http://collectl.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~ia64 ~x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-4.0.5.src.tar.gz
-_md5_=70e9811c5e7edf6d7b75dfe89a4f9140
+_md5_=fb3267d29a5fcc48d1a40eeea264b26e
diff --git a/metadata/md5-cache/sys-apps/collectl-4.1.0 b/metadata/md5-cache/sys-apps/collectl-4.1.0
index 737a1455acf5..1838b319cfef 100644
--- a/metadata/md5-cache/sys-apps/collectl-4.1.0
+++ b/metadata/md5-cache/sys-apps/collectl-4.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DESCRIPTION=light-weight performance monitoring tool capable of reporting interactively and logging to disk
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=5
 HOMEPAGE=http://collectl.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~ia64 ~x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-4.1.0.src.tar.gz
-_md5_=70e9811c5e7edf6d7b75dfe89a4f9140
+_md5_=fb3267d29a5fcc48d1a40eeea264b26e
diff --git a/metadata/md5-cache/sys-apps/collectl-4.1.3 b/metadata/md5-cache/sys-apps/collectl-4.1.3
index fd4ecfde320a..c6076cc865c2 100644
--- a/metadata/md5-cache/sys-apps/collectl-4.1.3
+++ b/metadata/md5-cache/sys-apps/collectl-4.1.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare
-DESCRIPTION=light-weight performance monitoring tool capable of reporting interactively and logging to disk
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=5
 HOMEPAGE=http://collectl.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~ia64 ~x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-4.1.3.src.tar.gz
-_md5_=6f204d2a2aa53fe27b5d8d7547da000a
+_md5_=e857a7a97f2ec207f5c6b7370af82f9a
diff --git a/metadata/md5-cache/sys-apps/collectl-4.2.0 b/metadata/md5-cache/sys-apps/collectl-4.2.0
index 22f899e8651a..4c9d1af3e1df 100644
--- a/metadata/md5-cache/sys-apps/collectl-4.2.0
+++ b/metadata/md5-cache/sys-apps/collectl-4.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DESCRIPTION=light-weight performance monitoring tool capable of reporting interactively and logging to disk
+DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
 EAPI=6
 HOMEPAGE=http://collectl.sourceforge.net/
 KEYWORDS=~alpha ~amd64 ~ia64 ~x86
@@ -7,4 +7,4 @@ LICENSE=GPL-2 Artistic
 RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
 SLOT=0
 SRC_URI=mirror://sourceforge/collectl/collectl-4.2.0.src.tar.gz
-_md5_=cfbd058d8929983a9fefb4604d945c24
+_md5_=e2c661607154a2846864bb897feb786b
diff --git a/metadata/md5-cache/sys-apps/gscanbus-0.8 b/metadata/md5-cache/sys-apps/gscanbus-0.8
index 7b72ae5a374e..d8db93c83a82 100644
--- a/metadata/md5-cache/sys-apps/gscanbus-0.8
+++ b/metadata/md5-cache/sys-apps/gscanbus-0.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=-
 DEPEND=sys-libs/libraw1394 x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=a little bus scanning, testing, and topology visualizing tool for the Linux IEEE1394 subsystem
+DESCRIPTION=Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/gscanbus.berlios/
 KEYWORDS=amd64 ppc x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/libraw1394 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gscanbus.berlios/gscanbus-0.8.tar.gz
-_md5_=75a305752ed08693043c7db5b98c555f
+_md5_=ccf2a78344a733f5fd5b1d12ec661fce
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.1.0 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.1.0
index d7d6b5e06a38..79ea5bbfa3bd 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.1.0
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst unpack
 DEPEND=>=sys-libs/librtas-1.3.1 sys-devel/bc
-DESCRIPTION=This package provides utilities for the maintainance of the IBM and Apple powerpc platforms.
+DESCRIPTION=Utilities for the maintainance of the IBM and Apple PowerPC platforms
 EAPI=0
 HOMEPAGE=http://powerpc-utils.ozlabs.org/
 KEYWORDS=ppc ppc64
@@ -9,4 +9,4 @@ RDEPEND=!sys-apps/ppc64-utils
 SLOT=0
 SRC_URI=http://powerpc-utils.ozlabs.org/releases/powerpc-utils-1.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=64863d1b9e3a188cfa5b16d29537e13b
+_md5_=f4ea4ca4a3e8492ae12c7aaee339d79a
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.12 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.12
index e1d3772a486f..2e37e3a17fe8 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.12
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.12
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=>=sys-libs/librtas-1.3.5 sys-devel/bc
-DESCRIPTION=This package provides utilities for the maintainance of the IBM and Apple powerpc platforms.
+DESCRIPTION=Utilities for the maintainance of the IBM and Apple PowerPC platforms
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/powerpc-utils
 KEYWORDS=ppc ppc64
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/librtas-1.3.5 sys-devel/bc
 SLOT=0
 SRC_URI=mirror://sourceforge/powerpc-utils/powerpc-utils-1.2.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e6f65c0a0dd07846501df507a138ed38
+_md5_=03654baa53e0508e09e18d12cfa9ee77
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.2 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.2
index 328cbdb5fb08..52bec85f07cc 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.2
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=>=sys-libs/librtas-1.3.1 sys-devel/bc !sys-apps/ibm-powerpc-utils-papr
-DESCRIPTION=This package provides utilities for the maintainance of the IBM and Apple powerpc platforms.
+DESCRIPTION=Utilities for the maintainance of the IBM and Apple PowerPC platforms
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/powerpc-utils
 KEYWORDS=ppc ppc64
@@ -9,4 +9,4 @@ RDEPEND=!sys-apps/ppc64-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/powerpc-utils/powerpc-utils-1.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=619e8119be86ee4b3c2cc9be5cc2b2d2
+_md5_=70cdb919ee2df78a950731b30ee6c691
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.25 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.25
index af4388995473..d32a3da551fc 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.25
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.25
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure
 DEPEND=sys-devel/bc
-DESCRIPTION=This package provides utilities for the maintainance of the IBM and Apple powerpc platforms.
+DESCRIPTION=Utilities for the maintainance of the IBM and Apple PowerPC platforms
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/powerpc-utils
 IUSE=+rtas
@@ -10,4 +10,4 @@ RDEPEND=rtas? ( >=sys-libs/librtas-1.3.5 ) sys-devel/bc
 SLOT=0
 SRC_URI=mirror://sourceforge/powerpc-utils/powerpc-utils-1.2.25.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bc39e697e3981bed6a9d2e6592f0f2f3
+_md5_=49cc467aa131626980a015c4b8d41aa6
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.26 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.26
index 8d91684b9d82..0d6f1a224f29 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.26
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-1.2.26
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure
 DEPEND=sys-devel/bc
-DESCRIPTION=This package provides utilities for the maintainance of the IBM and Apple powerpc platforms.
+DESCRIPTION=Utilities for the maintainance of the IBM and Apple PowerPC platforms
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/powerpc-utils
 IUSE=+rtas
@@ -10,4 +10,4 @@ RDEPEND=rtas? ( >=sys-libs/librtas-1.3.5 ) sys-devel/bc
 SLOT=0
 SRC_URI=mirror://sourceforge/powerpc-utils/powerpc-utils-1.2.26.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bc39e697e3981bed6a9d2e6592f0f2f3
+_md5_=49cc467aa131626980a015c4b8d41aa6
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0
index 88617695dd53..eed852ec02fc 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst unpack
-DESCRIPTION=This package provides the utilities which are intended for the maintenance of IBM powerpc platforms
+DESCRIPTION=Utilities for the maintenance of IBM PowerPC platforms
 EAPI=0
 HOMEPAGE=http://powerpc-utils.ozlabs.org/
 KEYWORDS=ppc ppc64
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/ibm-powerpc-utils-1.1.0 sys-libs/librtas virtual/logger
 SLOT=0
 SRC_URI=http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-1.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6ab916bacc5e6875c9a34086ecc88c0b
+_md5_=f9749a11b851997e697941befb16cda1
diff --git a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.6 b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.6
index 66c399f92a7d..7695a750848f 100644
--- a/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.6
+++ b/metadata/md5-cache/sys-apps/ibm-powerpc-utils-papr-1.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst unpack
-DESCRIPTION=This package provides the utilities which are intended for the maintenance of IBM powerpc platforms
+DESCRIPTION=Utilities for the maintenance of IBM PowerPC platforms
 EAPI=0
 HOMEPAGE=http://powerpc-utils.ozlabs.org/
 KEYWORDS=~ppc ~ppc64
@@ -8,4 +8,4 @@ RDEPEND=>=sys-apps/ibm-powerpc-utils-1.1.2 sys-libs/librtas virtual/logger
 SLOT=0
 SRC_URI=http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-1.1.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d7899a4a5779a78a8909ae3e1aaa5324
+_md5_=c196e3e41641edffca7463475094e8dd
diff --git a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1 b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1
index 94d11cf38435..cde76810e1e6 100644
--- a/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1
+++ b/metadata/md5-cache/sys-apps/qcontrol-0.4.2-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=>=dev-lang/lua-5.1
-DESCRIPTION=Allows to send commands to some microcontrollers, for example to change leds or sound a buzzer
+DESCRIPTION=Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer
 EAPI=0
 HOMEPAGE=http://qnap.nas-central.org/index.php/PIC_Control_Software
 KEYWORDS=arm
@@ -9,4 +9,4 @@ RDEPEND=>=dev-lang/lua-5.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2.orig.tar.gz mirror://debian/pool/main/q/qcontrol/qcontrol_0.4.2-6.diff.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6eb69badf3b5004e3036f0dfae88b401
+_md5_=b7aef17ada779eb07176fd65cf186530
diff --git a/metadata/md5-cache/sys-apps/vbetool-1.1 b/metadata/md5-cache/sys-apps/vbetool-1.1
index 724f9469afc9..bd7ca5205d43 100644
--- a/metadata/md5-cache/sys-apps/vbetool-1.1
+++ b/metadata/md5-cache/sys-apps/vbetool-1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure prepare
 DEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 >=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=Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)
+DESCRIPTION=Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)
 EAPI=4
 HOMEPAGE=http://www.codon.org.uk/~mjg59/vbetool/
 KEYWORDS=amd64 x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
 SLOT=0
 SRC_URI=http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=287ff80ebffce68c91eb4aeb6da73f49
+_md5_=86d65688e0ce679237715a5456238fb6
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index abc9e4fc6a94..cfe9e9d1f15f 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.6 b/metadata/md5-cache/sys-auth/pam-script-1.1.6
index b9bdab4ac053..0a57d439888e 100644
--- a/metadata/md5-cache/sys-auth/pam-script-1.1.6
+++ b/metadata/md5-cache/sys-auth/pam-script-1.1.6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DEPEND=virtual/pam
-DESCRIPTION=PAM module for executing scripts during authorization, password changes, and sessions
+DESCRIPTION=PAM module for running scripts during authorization, password change and session
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/
 IUSE=examples
@@ -10,4 +10,4 @@ RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/pam-script/pam-script-1.1.6.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cd0620cec4c54189ac5e8bf4a82b3703
+_md5_=cffdecbb685a2e6599a0f79fa45cf699
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.7 b/metadata/md5-cache/sys-auth/pam-script-1.1.7
index 454b45cd3e9b..ae075b8c79cf 100644
--- a/metadata/md5-cache/sys-auth/pam-script-1.1.7
+++ b/metadata/md5-cache/sys-auth/pam-script-1.1.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DEPEND=virtual/pam
-DESCRIPTION=PAM module for executing scripts during authorization, password changes, and sessions
+DESCRIPTION=PAM module for running scripts during authorization, password change and session
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/
 IUSE=examples
@@ -10,4 +10,4 @@ RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/pam-script-1.1.7.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e62902386b2599158886eb8de358635f
+_md5_=3b65baf5a8577a06d21e003651f53832
diff --git a/metadata/md5-cache/sys-auth/pam-script-1.1.8 b/metadata/md5-cache/sys-auth/pam-script-1.1.8
index 7cb88263ef0f..cc5b659a2134 100644
--- a/metadata/md5-cache/sys-auth/pam-script-1.1.8
+++ b/metadata/md5-cache/sys-auth/pam-script-1.1.8
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=virtual/pam >=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=PAM module for executing scripts during authorization, password changes, and sessions
+DESCRIPTION=PAM module for running scripts during authorization, password change and session
 EAPI=6
 HOMEPAGE=https://github.com/jeroennijhof/pam_script/
 IUSE=examples
@@ -10,4 +10,4 @@ RDEPEND=virtual/pam
 SLOT=0
 SRC_URI=https://github.com/jeroennijhof/pam_script/archive/1.1.8.tar.gz -> pam-script-1.1.8.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2f10063f5cfd68fdb1d99e79a97f8705
+_md5_=b5032802643ff29017c604b1808ea2e1
diff --git a/metadata/md5-cache/sys-auth/pam_blue-0.9.0 b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
index 4772af107706..7c21c3466650 100644
--- a/metadata/md5-cache/sys-auth/pam_blue-0.9.0
+++ b/metadata/md5-cache/sys-auth/pam_blue-0.9.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=virtual/pam net-wireless/bluez >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Linux PAM module providing ability to authenticate via a bluetooth compatible device
+DESCRIPTION=PAM module providing ability to authenticate via a bluetooth compatible device
 EAPI=0
 HOMEPAGE=http://pam.0xdef.net/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=virtual/pam net-wireless/bluez
 SLOT=0
 SRC_URI=http://pam.0xdef.net/source/pam_blue-0.9.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=aba35e38ed2c7f9b5015c6ff1148c687
+_md5_=f92333ff108d46d533f40ef217779b30
diff --git a/metadata/md5-cache/sys-auth/pam_blue-0.9.0-r1 b/metadata/md5-cache/sys-auth/pam_blue-0.9.0-r1
index 414b7ae6ecde..664c907b753b 100644
--- a/metadata/md5-cache/sys-auth/pam_blue-0.9.0-r1
+++ b/metadata/md5-cache/sys-auth/pam_blue-0.9.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=virtual/pam net-wireless/bluez >=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=Linux PAM module providing ability to authenticate via a bluetooth compatible device
+DESCRIPTION=PAM module providing ability to authenticate via a bluetooth compatible device
 EAPI=5
 HOMEPAGE=http://pam.0xdef.net/
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=virtual/pam net-wireless/bluez
 SLOT=0
 SRC_URI=http://pam.0xdef.net/source/pam_blue-0.9.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a83f9c126edbc576db867a95a13cb4db
+_md5_=0e3287f6c0a9db7b01b008a0458982e1
diff --git a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1 b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
index 048db73eb993..4137d644cffd 100644
--- a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
+++ b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst unpack
 DEPEND=>=sys-libs/pam-0.75
-DESCRIPTION=The PAM SMB module, allows authentication against a SMB (such as the Win_x families) server
+DESCRIPTION=PAM module for authenticating against an SMB (such as the Win_x families) server
 EAPI=0
 HOMEPAGE=http://www.csn.ul.ie/~airlied/pam_smb/
 KEYWORDS=~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=mirror://samba/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=af50e4b50040d5ff3fe122c43f3051b8
+_md5_=c20032375127e1cf7ee008533dec290d
diff --git a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2 b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
index 6e6fb6eee0e3..9ab8a8f6bf0d 100644
--- a/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
+++ b/metadata/md5-cache/sys-auth/pam_smb-2.0.0_rc6-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare
 DEPEND=>=sys-libs/pam-0.75
-DESCRIPTION=The PAM SMB module, allows authentication against a SMB (such as the Win_x families) server
+DESCRIPTION=PAM module for authenticating against an SMB (such as the Win_x families) server
 EAPI=5
 HOMEPAGE=http://www.csn.ul.ie/~airlied/pam_smb/
 KEYWORDS=~ppc ~x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/pam-0.75
 SLOT=0
 SRC_URI=mirror://samba/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6e93828b826e6ba0bf7dfccbd1c9ddb0
+_md5_=e92f3b026e8f55850b199d4dcc30dbb6
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index 8d10dce04b59..aa998cf04493 100644
--- a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
+++ b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
 DEPEND=virtual/libusb:0 pam? ( virtual/pam ) sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=Support for the UPEK/SGS Thomson Microelectronics fingerprint reader, often seen in Thinkpads
+DESCRIPTION=Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads
 EAPI=4
 HOMEPAGE=http://thinkfinger.sourceforge.net/
 IUSE=debug pam static-libs
@@ -10,4 +10,4 @@ RDEPEND=virtual/libusb:0 pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5ff85cad3adf0edacd461001839d3373
+_md5_=875f713a0b579755919c203057995ada
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 8e9b04af1d85..1147a0f46bea 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/endpoint-0.1.0 b/metadata/md5-cache/sys-block/endpoint-0.1.0
index d82bc9677802..bb2056cd43d7 100644
--- a/metadata/md5-cache/sys-block/endpoint-0.1.0
+++ b/metadata/md5-cache/sys-block/endpoint-0.1.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=>=sys-libs/libraw1394-0.9 >=dev-libs/glib-2 virtual/pkgconfig
-DESCRIPTION=Endpoint turns a Linux machine with one or more firewire cards into an SBP-2 device
+DESCRIPTION=Endpoint turns a Linux machine with a firewire card into an SBP-2 device
 EAPI=0
 HOMEPAGE=http://oss.oracle.com/projects/endpoint/
 KEYWORDS=~amd64 ~ppc x86
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/libraw1394-0.9 >=dev-libs/glib-2
 SLOT=0
 SRC_URI=http://oss.oracle.com/projects/endpoint/dist/files/endpoint-0.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1a11f2094f24f3ec680c265cf105e086
+_md5_=cdb1f25208c0a7eea8c25333989feaa4
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0 b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
index a9d660ed8bab..320daa767277 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
+DESCRIPTION=HP Array Config Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
 EAPI=5
 HOMEPAGE=http://h18000.www1.hp.com/products/servers/linux/documentation.html
 KEYWORDS=-* ~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v77370/hpacucli-9.30-15.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v77371/hpacucli-9.30-15.0.i386.rpm )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7698ac7907034d673e6d8e0fc2984b06
+_md5_=16e2666efaaffdca8ffa6e9bcdfda432
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index e4a933e31df6..d66f059a7120 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
+DESCRIPTION=HP Array Config Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)
 EAPI=6
 HOMEPAGE=http://h18000.www1.hp.com/products/servers/linux/documentation.html
 KEYWORDS=-* amd64 x86
@@ -9,4 +9,4 @@ RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=963dd3e2d4351369077b8fb83e8dd4da
+_md5_=2eaf5c83ce7e781a71a3e76d877d41ef
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
index 6358b4501cd2..643841df296f 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=slp? ( net-libs/openslp )
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=2
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp
@@ -10,4 +10,4 @@ RDEPEND=slp? ( net-libs/openslp ) sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7d519808e749c350a305797c2737901a
+_md5_=bf04c00a9a2c47f8b29f221cdd423881
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
index b980e79d5a8a..c150cb67d557 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.872-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
 DEPEND=slp? ( net-libs/openslp )
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=2
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp
@@ -10,4 +10,4 @@ RDEPEND=slp? ( net-libs/openslp ) virtual/udev sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=27cd425282c3082d7f95260cbfbe3818
+_md5_=206946fad2468c617094745277ca99e6
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873
index 64a44572cfb8..e8858049b950 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=slp? ( net-libs/openslp )
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=5
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp
@@ -10,4 +10,4 @@ RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2764186d354cc8f54c1826d7dc87ec0f
+_md5_=29d432dc464b7e99d2a5da869f715ca2
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
index ff5999cc3fdf..1151742c65f1 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=slp? ( net-libs/openslp ) virtual/pkgconfig
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=5
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp
@@ -10,4 +10,4 @@ RDEPEND=slp? ( net-libs/openslp ) sys-fs/lsscsi sys-apps/util-linux
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=28439f0b987f3f0d3ce554fb0a28c69b
+_md5_=da7c7150bbcacd3198827ca93becf054
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
index d047faac578a..e29c468019f6 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) virtual/pkgconfig
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=5
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp +tcp infiniband rdma
@@ -11,4 +11,4 @@ REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=04edfd279ba8be959980596ed7b2d32a
+_md5_=6d54242a66d0751b632825b4d8586bb0
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3 b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
index d0d21ebab630..32137a70c276 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.0.873-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=slp? ( net-libs/openslp ) infiniband? ( sys-fabric/ofed ) virtual/pkgconfig
-DESCRIPTION=Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720
+DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
 EAPI=5
 HOMEPAGE=http://www.open-iscsi.com/
 IUSE=debug slp +tcp infiniband rdma
@@ -11,4 +11,4 @@ REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
 SLOT=0
 SRC_URI=http://www.open-iscsi.org/bits/open-iscsi-2.0-873.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f62f47f030fed4a137c9d82b38dbf952
+_md5_=24c732e22e00a72d5cf80be77e7d6910
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9 b/metadata/md5-cache/sys-block/partimage-0.6.9
index 8597e4a103c2..c30daa3355eb 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=config configure install postinst prepare setup
 DEPEND=!static? ( pam? ( virtual/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Console-based application to efficiently save raw partition data to an image file
+DESCRIPTION=Console-based application to efficiently save raw partition data to image file
 EAPI=4
 HOMEPAGE=http://www.partimage.org/
 IUSE=nls nologin pam ssl static
@@ -10,4 +10,4 @@ RDEPEND=!static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/n
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6df2f16bfffba9ee0ac773207da47403
+_md5_=df2177c025973829e46a31bb3ad5f147
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 6b9408022a96..1ee786fa6df5 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.2.3_pre20171121 b/metadata/md5-cache/sys-cluster/charliecloud-0.2.3_pre20171121
new file mode 100644
index 000000000000..e76a2c5ff3ce
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.2.3_pre20171121
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install test
+DEPEND=doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme net-misc/rsync ) test? ( app-arch/pigz )
+DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
+EAPI=6
+HOMEPAGE=https://hpc.github.io/charliecloud/
+IUSE=doc examples suid test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hpc/charliecloud/archive/3eb9e3edfbcd61257bb52a361cf01782fcf15b5d.tar.gz -> charliecloud-0.2.3_pre20171121.tar.gz
+_md5_=357e7fc1db79d2287b2064d9545a79f5
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
new file mode 100644
index 000000000000..3a8ac65dcc2d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme net-misc/rsync ) test? ( app-arch/pigz ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
+EAPI=6
+HOMEPAGE=https://hpc.github.io/charliecloud/
+IUSE=doc examples suid test
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
+_md5_=c870916b18d498e0045f8d03eaea87e9
diff --git a/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4 b/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
index b693db05c281..461447cf5bac 100644
--- a/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
+++ b/metadata/md5-cache/sys-cluster/feedbackd-agent-0.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=dev-libs/libxml2 dev-lang/perl
-DESCRIPTION=system for dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster
+DESCRIPTION=Dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster
 EAPI=0
 HOMEPAGE=http://ozlabs.org/~jk/projects/feedbackd/
 KEYWORDS=x86
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/libxml2 dev-lang/perl
 SLOT=0
 SRC_URI=mirror://sourceforge/feedbackd/feedbackd-agent-0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4bdbb73804e9b280d3e62dd6cccc268b
+_md5_=042caffc557ec8d899516d666012f2e1
diff --git a/metadata/md5-cache/sys-cluster/hpl-2.0-r3 b/metadata/md5-cache/sys-cluster/hpl-2.0-r3
index ea2554b78fd9..73efa61dae64 100644
--- a/metadata/md5-cache/sys-cluster/hpl-2.0-r3
+++ b/metadata/md5-cache/sys-cluster/hpl-2.0-r3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare
 DEPEND=virtual/pkgconfig
-DESCRIPTION=A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers
+DESCRIPTION=Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters
 EAPI=4
 HOMEPAGE=http://www.netlib.org/benchmark/hpl/
 IUSE=doc
@@ -10,4 +10,4 @@ RDEPEND=virtual/blas virtual/lapack virtual/mpi
 SLOT=0
 SRC_URI=http://www.netlib.org/benchmark/hpl/hpl-2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c85de954961f0d5fb89cc2b0549eda65
+_md5_=861b5f67e2513758e1c04085729d9096
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
index 90d2d8ba3778..c1ed15269a47 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.2.0_rc1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=virtual/mpi doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422
-DESCRIPTION=an API for distributing embarrassingly parallel workloads using self-stabilization
+DESCRIPTION=API for distributing embarrassingly parallel workloads using self-stabilization
 EAPI=5
 HOMEPAGE=https://github.com/hpc/libcircle
 IUSE=doc test
@@ -10,4 +10,4 @@ RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/archive/0.2.0-rc.1.tar.gz -> libcircle-0.2.0_rc1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=be6e4a023fd45e274ed22e0de6cde6d1
+_md5_=f2ec075b7b6b2ff7a957bb642ef26d23
diff --git a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1 b/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
index 91e8cc48b0a9..8fed8df83e67 100644
--- a/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
+++ b/metadata/md5-cache/sys-cluster/libcircle-0.2.1_rc1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=virtual/mpi doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=app-portage/elt-patches-20170422
-DESCRIPTION=an API for distributing embarrassingly parallel workloads using self-stabilization
+DESCRIPTION=API for distributing embarrassingly parallel workloads using self-stabilization
 EAPI=5
 HOMEPAGE=https://github.com/hpc/libcircle
 IUSE=doc test
@@ -10,4 +10,4 @@ RDEPEND=virtual/mpi
 SLOT=0
 SRC_URI=https://github.com/hpc/libcircle/archive/0.2.1-rc.1.tar.gz -> libcircle-0.2.1_rc1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=be6e4a023fd45e274ed22e0de6cde6d1
+_md5_=f2ec075b7b6b2ff7a957bb642ef26d23
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.22.3 b/metadata/md5-cache/sys-cluster/minikube-0.24.1
index 683f1c22a8cd..427265f4b973 100644
--- a/metadata/md5-cache/sys-cluster/minikube-0.22.3
+++ b/metadata/md5-cache/sys-cluster/minikube-0.24.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=sys-cluster/kubectl-1.8.0
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/kubernetes/minikube/archive/v0.22.3.tar.gz -> minikube-0.22.3.tar.gz
+SRC_URI=https://github.com/kubernetes/minikube/archive/v0.24.1.tar.gz -> minikube-0.24.1.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_=ec227f47e88161c9e3e71960ecdc86f4
+_md5_=06af3b9a3803467065ecafc33305c197
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index def409ca1141..43f939ac9bff 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r1 b/metadata/md5-cache/sys-devel/bc-1.06.95-r1
index 323f5fca9a02..ab9f0dcc8176 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r1
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r1
@@ -10,4 +10,4 @@ RDEPEND=readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 ) libedit? (
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=642129cc554b82b179b2674f82767350
+_md5_=dde284553be2efc739ba7bcc50ca04ce
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 2311a7fb2613..4e3a5693c223 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -10,4 +10,4 @@ RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/re
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2e6e2bc6c0abe70bc25fce2ccfc78aea
+_md5_=c07058f8ba6f9e6c86363f53ae7adddb
diff --git a/metadata/md5-cache/sys-devel/gcc-6.4.0 b/metadata/md5-cache/sys-devel/gcc-6.4.0
index 74c4e11cc297..46cab19f04bc 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-6.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=5
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=regression-test vanilla altivec debug doc gcj awt hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-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 )
@@ -12,4 +12,4 @@ 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-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.4.0-uclibc-patches-1.0.tar.bz2 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain	9147783f01244fc11a8b772e26e70ef3	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e496b1bcd029c72b439fbdf2a6117471
+_md5_=c01dc70788109e92bdaec7c9f456cd10
diff --git a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1 b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
index efe2a0415551..654d840e06ba 100644
--- a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
+++ b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare setup unpack
 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=icecc is a program for distributed compiling of C(++) code across several machines; based on distcc
+DESCRIPTION=Distributed compiling of C(++) code across several machines; based on distcc
 EAPI=4
 HOMEPAGE=http://en.opensuse.org/Icecream
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=8456196d5867faf887edab33e39b4966
+_md5_=23f719447d434b9b4f35e8c2551b1ba5
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r1 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
index 8d95070a505e..448e7b8279e9 100644
--- a/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
+++ b/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup unpack
 DEPEND=sys-libs/libcap-ng
-DESCRIPTION=icecc is a program for distributed compiling of C(++) code across several machines; based on distcc
+DESCRIPTION=Distributed compiling of C(++) code across several machines; based on distcc
 EAPI=5
 HOMEPAGE=https://github.com/icecc/icecream
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/libcap-ng
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=c49403557046eb4dd4482079e1356745
+_md5_=4087c7a567498849f15abf0d55074cc3
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
index c1b384a4cd4b..57d7c44ebc6a 100644
--- a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
+++ b/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prerm setup
 DEPEND=sys-libs/libcap-ng
-DESCRIPTION=icecc is a program for distributed compiling of C(++) code across several machines; based on distcc
+DESCRIPTION=Distributed compiling of C(++) code across several machines; based on distcc
 EAPI=6
 HOMEPAGE=https://github.com/icecc/icecream
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/libcap-ng dev-util/shadowman
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
 _eclasses_=user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7bc066955752590035e6bc1086ab5850
+_md5_=9742ca33996073795c2e308b58b5bc3f
diff --git a/metadata/md5-cache/sys-devel/remake-3.81.0.2 b/metadata/md5-cache/sys-devel/remake-3.81.0.2
index f08a5deb667b..f5d8bb639845 100644
--- a/metadata/md5-cache/sys-devel/remake-3.81.0.2
+++ b/metadata/md5-cache/sys-devel/remake-3.81.0.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
-DESCRIPTION=patched version of GNU make that adds improved error reporting, tracing, and a debugger
+DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
 EAPI=0
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-1
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-3.81+dbg-0.2.tar.bz2
-_md5_=996df1d095f74180d0211db69c45ee1a
+_md5_=71184aee0c41e896f6f3b145b59ecff4
diff --git a/metadata/md5-cache/sys-devel/remake-3.81.0.3 b/metadata/md5-cache/sys-devel/remake-3.81.0.3
index 1da0d2d854cc..a1a03c0338e4 100644
--- a/metadata/md5-cache/sys-devel/remake-3.81.0.3
+++ b/metadata/md5-cache/sys-devel/remake-3.81.0.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
-DESCRIPTION=patched version of GNU make that adds improved error reporting, tracing, and a debugger
+DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
 EAPI=0
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-1
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-3.81+dbg-0.3.tar.bz2
-_md5_=6ba6862d98325063b1af598513a64b9b
+_md5_=49deddb91cbf94ba09b64ac8e3d35262
diff --git a/metadata/md5-cache/sys-devel/remake-3.82.0.4 b/metadata/md5-cache/sys-devel/remake-3.82.0.4
index e9869308aa21..b2ada068ebe4 100644
--- a/metadata/md5-cache/sys-devel/remake-3.82.0.4
+++ b/metadata/md5-cache/sys-devel/remake-3.82.0.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=readline? ( sys-libs/readline )
-DESCRIPTION=patched version of GNU make that adds improved error reporting, tracing, and a debugger
+DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
 EAPI=0
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 IUSE=readline
@@ -9,4 +9,4 @@ LICENSE=GPL-1
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-3.82+dbg-0.4.tar.bz2
-_md5_=09a15919e95c1542d569b0e6d2f03b5d
+_md5_=d0ae02a1d2b13ae31e83a1dd26f938cb
diff --git a/metadata/md5-cache/sys-devel/remake-3.82.0.9 b/metadata/md5-cache/sys-devel/remake-3.82.0.9
index dfd8d94c4dde..1a232beb4b38 100644
--- a/metadata/md5-cache/sys-devel/remake-3.82.0.9
+++ b/metadata/md5-cache/sys-devel/remake-3.82.0.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=readline? ( sys-libs/readline )
-DESCRIPTION=patched version of GNU make that adds improved error reporting, tracing, and a debugger
+DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
 EAPI=4
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 IUSE=readline
@@ -9,4 +9,4 @@ LICENSE=GPL-1
 RDEPEND=readline? ( sys-libs/readline )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-3.82+dbg0.9.tar.bz2
-_md5_=dbabc85ee1ecb6ccf9d805c461d387ed
+_md5_=e1f7e86a5e84471a7830eeb5df0d21bc
diff --git a/metadata/md5-cache/sys-devel/remake-4.1.1.1 b/metadata/md5-cache/sys-devel/remake-4.1.1.1
index cbe7d6e22a50..c1437cc6f541 100644
--- a/metadata/md5-cache/sys-devel/remake-4.1.1.1
+++ b/metadata/md5-cache/sys-devel/remake-4.1.1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DEPEND=readline? ( sys-libs/readline:0= ) guile? ( >=dev-scheme/guile-1.8:= )
-DESCRIPTION=patched version of GNU make that adds improved error reporting, tracing, and a debugger
+DESCRIPTION=patched version of GNU make with improved error reporting, tracing and debugging
 EAPI=5
 HOMEPAGE=http://bashdb.sourceforge.net/remake/
 IUSE=guile readline
@@ -9,4 +9,4 @@ LICENSE=GPL-1
 RDEPEND=readline? ( sys-libs/readline:0= ) guile? ( >=dev-scheme/guile-1.8:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/bashdb/remake-4.1+dbg1.1.tar.bz2
-_md5_=367dcde1bc3ac0499fb5487cc31d598b
+_md5_=8e0b24b12b5cdec638593659b16f759e
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index 05c842b9f26c..75ad37506729 100644
--- a/metadata/md5-cache/sys-fabric/Manifest.gz
+++ b/metadata/md5-cache/sys-fabric/Manifest.gz
diff --git a/metadata/md5-cache/sys-fabric/libibmad-1.3.11 b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
index b2353dd02540..10df9c0810dc 100644
--- a/metadata/md5-cache/sys-fabric/libibmad-1.3.11
+++ b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
@@ -1,6 +1,6 @@
 DEFINED_PHASES=unpack
 DEPEND=sys-fabric/libibumad:3.12 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=OpenIB library providing low layer IB functions for use by the IB diagnostic/management programs
+DESCRIPTION=OpenIB library provides the API for use interfacing with IB management programs
 EAPI=5
 HOMEPAGE=https://www.openfabrics.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibumad:3.12 !sys-fabric/libibmad:0 !sys-fabric/libibmad:3.
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=6aee8c2b143f99d6c8e94258fe32b787
+_md5_=93b58ec22148e0edd8a8cd8d62aeac37
diff --git a/metadata/md5-cache/sys-fabric/libibumad-1.3.9 b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
index 779697afbc64..b4639686a9d3 100644
--- a/metadata/md5-cache/sys-fabric/libibumad-1.3.9
+++ b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=unpack
 DEPEND=sys-fabric/libibverbs:3.12 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=OpenIB User MAD library functions which sit on top of the user MAD modules in the kernel
+DESCRIPTION=OpenIB User MAD lib functions which sit on top of the user MAD kernel modules
 EAPI=5
 HOMEPAGE=https://www.openfabrics.org/
 KEYWORDS=~amd64 ~x86 ~amd64-linux
@@ -9,4 +9,4 @@ RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libibumad:0 !sys-fabric/libibumad
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=756b1849b6dae1c8381c7a8a2debb9a5
+_md5_=1fc6881a626b877ffdfc30d3208f5db0
diff --git a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7 b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
index 8456b72460f3..8f92484060d8 100644
--- a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
+++ b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
@@ -1,6 +1,6 @@
 DEFINED_PHASES=unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware
+DESCRIPTION=A library to use InfiniBand 'verbs' for direct access to IB hardware
 EAPI=5
 HOMEPAGE=https://www.openfabrics.org/
 KEYWORDS=amd64 x86 ~amd64-linux
@@ -9,4 +9,4 @@ RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libibverbs:0 !sys-fabric/libibv
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	openib	443c6b0f0a1051b711905cf473961cb2	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3290fd6b9e914c8e73d30404eea45797
+_md5_=3a06fc8c31b2bf4a6ada9ef7ff0d0bc7
diff --git a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1 b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
index 07047ba4e6ff..bc3995d31adc 100644
--- a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
+++ b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install test unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware
+DESCRIPTION=A library to use InfiniBand 'verbs' for direct access to IB hardware
 EAPI=5
 HOMEPAGE=https://www.openfabrics.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
@@ -10,4 +10,4 @@ RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libibverbs:0 !sys-fabric/libibv
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	openib	443c6b0f0a1051b711905cf473961cb2	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5644f136d57037f0d731d68df08b85ab
+_md5_=2df561d41bd3473a2f4d9575b1bd3872
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 814cca5b9823..99e3fe61c8d8 100644
--- a/metadata/md5-cache/sys-firmware/Manifest.gz
+++ b/metadata/md5-cache/sys-firmware/Manifest.gz
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.2 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.2
index b91138760f47..2135c75769ce 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.2
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )
-DESCRIPTION=open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware
+DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
 EAPI=5
 HOMEPAGE=http://sigrok.org/wiki/Fx2lafw
 IUSE=binary
@@ -9,4 +9,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=binary? ( http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz ) !binary? ( http://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3e1caf5c3828fd0d50211e8c806dade4
+_md5_=02d48e9f00d34b93cb1978489f34788f
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.3 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.3
index 835c594d9a0b..6087e8b32ced 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.3
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )
-DESCRIPTION=open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware
+DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
 EAPI=6
 HOMEPAGE=http://sigrok.org/wiki/Fx2lafw
 IUSE=binary
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=binary? ( http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz ) !binary? ( http://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.tar.gz )
-_md5_=dc5611905d7545cdec934fa6e3b83377
+_md5_=41cd6ab2e55b3a2dd2db4daf1b89080c
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.4 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.4
index d991fa073c83..87d2e30bd1c7 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.4
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )
-DESCRIPTION=open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware
+DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
 EAPI=6
 HOMEPAGE=http://sigrok.org/wiki/Fx2lafw
 IUSE=binary
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=binary? ( http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.4.tar.gz ) !binary? ( http://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.tar.gz )
-_md5_=dc5611905d7545cdec934fa6e3b83377
+_md5_=41cd6ab2e55b3a2dd2db4daf1b89080c
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.5 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.5
index 51ba541117fa..c00c89344ee3 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.5
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-0.1.5
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=!binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )
-DESCRIPTION=open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware
+DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
 EAPI=6
 HOMEPAGE=http://sigrok.org/wiki/Fx2lafw
 IUSE=binary
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=binary? ( http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-0.1.5.tar.gz ) !binary? ( http://sigrok.org/download/source/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.tar.gz )
-_md5_=070bf576861f807edd148ed79951b6aa
+_md5_=5c4a66f4ca97c94f91f9bc460042058c
diff --git a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999 b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
index 14f13b83f141..d1709c20f339 100644
--- a/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
+++ b/metadata/md5-cache/sys-firmware/sigrok-firmware-fx2lafw-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install prepare unpack
 DEPEND=>=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] >=dev-vcs/git-1.8.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
-DESCRIPTION=open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware
+DESCRIPTION=Firmware for Cypress FX2 chips for use as simple logic analyzer hardware
 EAPI=6
 HOMEPAGE=http://sigrok.org/wiki/Fx2lafw
 LICENSE=GPL-2+
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dc5611905d7545cdec934fa6e3b83377
+_md5_=41cd6ab2e55b3a2dd2db4daf1b89080c
diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz
index 077342125369..56ee1ae403a3 100644
--- a/metadata/md5-cache/sys-freebsd/Manifest.gz
+++ b/metadata/md5-cache/sys-freebsd/Manifest.gz
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.3 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.3
index fe3335106d2a..ccde07c3fa7e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-10.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_GNU profile
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.3-RELEASE/src.txz -> freebsd-src-10.3.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c4676c20267f702adbbee0d110c2d9c5
+_md5_=5afeb273aa0d219e6ea604d862a15961
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.0 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.0
index c37eb2118360..f4bb4b02b0fb 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_GNU profile
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.0-RELEASE/src.txz -> freebsd-src-11.0.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=30e80a291fdb8253b468d6bc9c388af7
+_md5_=c74e42d68c7f8111d644448ac11c6af4
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
index ee5bab108ecc..391132d641f3 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
 EAPI=5
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_GNU profile
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/11.1-RELEASE/src.txz -> freebsd-src-11.1.tar.xz
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4cf7fa5ee88afa535b2fb367ba05e0dc
+_md5_=190738a78af61ed732272edde6b65596
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
index b2c681930dc4..af9f8eb1ed92 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-8.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install unpack
 DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
 EAPI=0
 HOMEPAGE=http://www.freebsd.org/
 IUSE=profile
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-8.2.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=46145869ec05a97f28e14653dc3be091
+_md5_=a86552c1b6ce2d8c07f0de585ff4eadc
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1
index 54abd86fc4f2..6d23e67a1fd3 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare unpack
 DEPEND=virtual/pmake virtual/pmake
-DESCRIPTION=Makefiles definitions used for building and installing libraries and system files
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
 EAPI=3
 HOMEPAGE=http://www.freebsd.org/
 IUSE=userland_GNU profile
@@ -10,4 +10,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-share-9.1.tar.bz2
 _eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8819c725bf9a9c1b6540a98a43df212a
+_md5_=c5f112b1900f8e260ba9ea50a3eb7bb1
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c48bda6c6f81..3d3a062019b7 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/ext4magic-0.3.2 b/metadata/md5-cache/sys-fs/ext4magic-0.3.2
index 29dc450ea407..9a8b59f4e444 100644
--- a/metadata/md5-cache/sys-fs/ext4magic-0.3.2
+++ b/metadata/md5-cache/sys-fs/ext4magic-0.3.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure prepare
 DEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fsprogs-1.41.9 sys-libs/zlib
-DESCRIPTION=Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems
+DESCRIPTION=Tool for recovery of deleted or overwritten files on ext3/ext4 filesystems
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/ext4magic/
 IUSE=debug expert-mode file-attr
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2 >=sys-apps/file-5.04 sys-apps/util-linux >=sys-fs/e2fspro
 SLOT=0
 SRC_URI=mirror://sourceforge/ext4magic/ext4magic-0.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0df9ff9a68797ee448e2281f88140d7c
+_md5_=52998beb719e33199dd8a0313a1ecdac
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2 b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
index 59a2d7ca0ae4..b934270481dc 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
+++ b/metadata/md5-cache/sys-fs/mdadm-3.3.1-r2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare test
 DEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A useful tool for running RAID systems - it can be used as a replacement for the raidtools
+DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
 EAPI=4
 HOMEPAGE=http://neil.brown.name/blog/mdadm
 IUSE=static
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.3.1.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3-2.debian.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=92e818860f7ebbf1264c373c0af4b229
+_md5_=a9af046f9559623e344be6a83183f223
diff --git a/metadata/md5-cache/sys-fs/mdadm-3.4 b/metadata/md5-cache/sys-fs/mdadm-3.4
index 4213dcf29b2f..cab443a245b4 100644
--- a/metadata/md5-cache/sys-fs/mdadm-3.4
+++ b/metadata/md5-cache/sys-fs/mdadm-3.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare test
 DEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A useful tool for running RAID systems - it can be used as a replacement for the raidtools
+DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
 EAPI=5
 HOMEPAGE=http://neil.brown.name/blog/mdadm
 IUSE=static
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-3.4.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.3.4-1.1.debian.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=fca8486790b6120fc84dec065fa14dfc
+_md5_=8b24489e3da59d03b5a1d3afd4b5cc28
diff --git a/metadata/md5-cache/sys-fs/mdadm-4.0 b/metadata/md5-cache/sys-fs/mdadm-4.0
index 81e25ba51637..fd0d4d4bac6d 100644
--- a/metadata/md5-cache/sys-fs/mdadm-4.0
+++ b/metadata/md5-cache/sys-fs/mdadm-4.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst prepare test
 DEPEND=virtual/pkgconfig app-arch/xz-utils virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=A useful tool for running RAID systems - it can be used as a replacement for the raidtools
+DESCRIPTION=Tool for running RAID systems - replacement for the raidtools
 EAPI=5
 HOMEPAGE=http://neil.brown.name/blog/mdadm
 IUSE=static
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/raid/mdadm/mdadm-4.0.tar.xz mirror://debian/pool/main/m/mdadm/mdadm_3.4-4.debian.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=366446e10e2e9f2245a6fddfe4dc2684
+_md5_=0da0ab21eb348b76b3a63c7939a9aec1
diff --git a/metadata/md5-cache/sys-fs/safecopy-1.7 b/metadata/md5-cache/sys-fs/safecopy-1.7
index 32e6483edc9c..a943535b1875 100644
--- a/metadata/md5-cache/sys-fs/safecopy-1.7
+++ b/metadata/md5-cache/sys-fs/safecopy-1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Data recovery tool to fault-tolerantly extract data from damaged (io-errors) devices or files
+DESCRIPTION=Tool for fault-tolerant data recovery from damaged (io-errors) devices or files
 EAPI=4
 HOMEPAGE=http://safecopy.sourceforge.net
 IUSE=test
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/safecopy/safecopy-1.7.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1151dc492d512c83c5f05e5f2581f57d
+_md5_=98dbb8cc5422bc79b4607cba251d5b2e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index da902a36a75c..c8e1557064d5 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.12
index bd0f45a432d8..972e6513369d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.12
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.12.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.12_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.12-13.base.tar.xz mirror://gentoo/genpatches-4.12-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.12-13.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=04c7c4294c8c6cb838de983797a78023
+_md5_=96aaab3231ed352d433af2f2af8eb623
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.13
index d12254ccfd98..cfc7fdbc9f3d 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.13
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.12.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.12_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.12-14.base.tar.xz mirror://gentoo/genpatches-4.12-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.12-14.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=89912caf91a63571662adc0af46dcdc2
+_md5_=07da73c1dec924135c87244e15d3f80e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.14 b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.14
index a0774e510af7..82ef0b081251 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.12.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.12.14
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.12.14
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.12_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.12-15.base.tar.xz mirror://gentoo/genpatches-4.12-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.12-15.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d6ba9c8439644c20cb00245fa3443b5b
+_md5_=11549f5c3e191ccf67a0beef1ea01079
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10
index 37932bf7b62e..1270cb8470dc 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.10
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.13.10
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171002.tar.xz !vanilla? ( 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2e4c4c749ca8e4da7ba789051c59c520
+_md5_=3494cda771b5ee7c604560a4088ce23e
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
index f5aee719d4f1..a067445dc5d7 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.13.11
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-13.base.tar.xz mirror://gentoo/genpatches-4.13-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-13.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a40426fe82a10e45633eb210f2b42a85
+_md5_=5b07ec8f0d1c88c44eb7e7e499ae51d0
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12
index ed05fbd30174..3759d764e2c9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.12
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.13.12
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-14.base.tar.xz mirror://gentoo/genpatches-4.13-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-14.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=badde295af2a4d745fa722f929f4200c
+_md5_=d044c6343f3c0b21d83624a1e006abb4
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13
index b1816a8e37ae..9c74c25b3a85 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.13
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.13.13
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-15.base.tar.xz mirror://gentoo/genpatches-4.13-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-15.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e7b1e9243ebb17eb8ee9ed5d081d6226
+_md5_=d7015e78026315b000a8a5827031216f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
index 5d213bb615ed..2d6d9f4b0a53 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.87-r1
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.87-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-91.base.tar.xz mirror://gentoo/genpatches-4.4-91.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-91.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=855f873ff114e738296cdbdf92dcd27c
+_md5_=da960c4172a9c1ab906edc2e661c1334
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95
index a294269b96b5..6dc59734a4f9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.95
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.95
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171002.tar.xz !vanilla? ( 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=09a41e61b1db0fa448561d6273aa1a4c
+_md5_=10709f7bbdb599d933709ac06f5fea8c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
index 229044fb439d..a9c4ffbcce51 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.96
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171002.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-100.base.tar.xz mirror://gentoo/genpatches-4.4-100.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-100.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9dc8a24b86d540379bb24de7f3c97865
+_md5_=787663aed6af624c4f49d59aacec4ac5
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97
index 70d6c3294ea7..83612e23ecd1 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.97
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.97
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-101.base.tar.xz mirror://gentoo/genpatches-4.4-101.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-101.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=bdc10128f3a1897a9845b3aa10dcb21e
+_md5_=f4a10d0253a37311927deef089a3d619
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98
index 693a92be11f7..641669074406 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.98
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.98
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-102.base.tar.xz mirror://gentoo/genpatches-4.4-102.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-102.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3286478491e2a3f97ffee6582fcd92f2
+_md5_=591ef7c4ea273b3cba31cd9402fcc53f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
index 7b07a02c7c46..4ae4208f7260 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.49-r1
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.49-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20170925.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-51.base.tar.xz mirror://gentoo/genpatches-4.9-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-51.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b44e42b551e2ad5a90eb12ac7ee199dc
+_md5_=578b0af3a35a12512dcb7014d9f1fabb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59
index 5512660ab5fc..f8ef05d87a2a 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.59
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.59
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171002.tar.xz !vanilla? ( 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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=261c1f63d605de9738cae036e933233d
+_md5_=d819032a440fb6bbcd055519fa13ecf1
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
index c618f0a63be0..2187c8b3f0aa 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.60
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-62.base.tar.xz mirror://gentoo/genpatches-4.9-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-62.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3c23c9ab5c4c499f3e7161f7c51f4a56
+_md5_=f9fc5718d8aba606cbf4330a7c4b4c4c
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61
index 05240d596a66..60b9b6b088b0 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.61
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.61
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-63.base.tar.xz mirror://gentoo/genpatches-4.9-63.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-63.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f685ef7ea2ab70af250868368162dd8b
+_md5_=0cf4455511956256382189c88b725fd6
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62
index 53b02d563fae..224a2a208b18 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.62
@@ -1,6 +1,6 @@
 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 linux kernel tree and aufs4 support
+DESCRIPTION=Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
 IUSE=experimental module vanilla symlink build
@@ -12,4 +12,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.62
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171106.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-64.base.tar.xz mirror://gentoo/genpatches-4.9-64.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-64.experimental.tar.xz ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=00587fc3283ac1796b1688f317c89b37
+_md5_=46d68f7f0c2ea5088bd1cc846b2f7d9a
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 100d06dc4156..a2a5f0a99391 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.3 b/metadata/md5-cache/sys-libs/libavc1394-0.5.3
index 711df62fbda6..c470874a91c6 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.3
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.3
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install
 DEPEND=>=sys-libs/libraw1394-0.8 virtual/pkgconfig
-DESCRIPTION=library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set
+DESCRIPTION=library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set
 EAPI=0
 HOMEPAGE=https://sourceforge.net/projects/libavc1394/
 KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-0.8
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.3.tar.gz
-_md5_=929695b02a3ae5ef1c1d06e7a10c28ba
+_md5_=785b30365df454936d95799f4a7a2483
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4
index 949bd22d18f1..e293c3c85f54 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.4
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-libs/libraw1394-0.8 virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set
+DESCRIPTION=library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/libavc1394/
 IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/libraw1394-0.8
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3318fe627db690e097f97babf9f114c4
+_md5_=56bb979adb5dc786b394180c8b3d62f0
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
index 898347e01521..a79cd4ff5bcc 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig >=app-portage/elt-patches-20170422
-DESCRIPTION=library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set
+DESCRIPTION=library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set
 EAPI=4
 HOMEPAGE=https://sourceforge.net/projects/libavc1394/
 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
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c7c9c4cfff8e07aa302f85fc34f14958
+_md5_=a065654b146fd556244f7c1c5d4e7a95
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.0.2 b/metadata/md5-cache/sys-libs/libchipcard-5.0.2
index c71ff7758eec..0fcf10698f6e 100644
--- a/metadata/md5-cache/sys-libs/libchipcard-5.0.2
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.0.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install
 DEPEND=>=sys-libs/gwenhywfar-4.2.1 >=sys-apps/pcsc-lite-1.6.2 sys-libs/zlib virtual/libintl sys-devel/gettext doc? ( app-doc/doxygen )
-DESCRIPTION=Libchipcard is a library for easy access to chip cards via chip card readers (terminals)
+DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
 EAPI=2
 HOMEPAGE=http://www.aquamaniac.de/aqbanking/
 IUSE=doc examples
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/gwenhywfar-4.2.1 >=sys-apps/pcsc-lite-1.6.2 sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file=01&dummy=libchipcard-5.0.2.tar.gz -> libchipcard-5.0.2.tar.gz
-_md5_=4ef4af5abf4875085e7715c727c2e7a1
+_md5_=63ca3c16b2bc3981f9e072f62b835489
diff --git a/metadata/md5-cache/sys-libs/libmath++-0.0.4-r1 b/metadata/md5-cache/sys-libs/libmath++-0.0.4-r1
index 64769843d748..9f3e03750411 100644
--- a/metadata/md5-cache/sys-libs/libmath++-0.0.4-r1
+++ b/metadata/md5-cache/sys-libs/libmath++-0.0.4-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=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=template based math library, written in C++, for symbolic and numeric calculus applications
+DESCRIPTION=C++ Template math library, for symbolic and numeric calculus applications
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=doc static-libs
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=1
 SRC_URI=mirror://gentoo/libmath++-0.0.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0104b47af139f8737a82cdb194fea001
+_md5_=a91a20ac3f8fb7eccf8b73b42496b577
diff --git a/metadata/md5-cache/sys-libs/libstdc++-v3-bin-3.3.6 b/metadata/md5-cache/sys-libs/libstdc++-v3-bin-3.3.6
index 155acd215b6e..52542be36e4a 100644
--- a/metadata/md5-cache/sys-libs/libstdc++-v3-bin-3.3.6
+++ b/metadata/md5-cache/sys-libs/libstdc++-v3-bin-3.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DESCRIPTION=Compatibility package for running binaries linked against a pre gcc 3.4 libstdc++
+DESCRIPTION=Compatibility package for running binaries linked against a <gcc-3.4 libstdc++
 EAPI=0
 HOMEPAGE=https://gcc.gnu.org/libstdc++/
 KEYWORDS=ia64 ppc64
@@ -8,4 +8,4 @@ RDEPEND=sys-libs/glibc
 RESTRICT=strip
 SLOT=0
 SRC_URI=ia64? ( mirror://gentoo/libstdc++-v3-bin-ia64-3.3.6.tbz2 ) ppc64? ( mirror://gentoo/libstdc++-v3-bin-ppc64-3.3.6.tbz2 )
-_md5_=1ad0218d6f7f03f7f47b9b8495422e7b
+_md5_=98326c3c88472f325e186d56ea6805c1
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2 b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
index f02979f735c1..20ce82951499 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info, which need root access
+DESCRIPTION=Library that allows non-privileged apps to write utmp (login) info
 EAPI=4
 HOMEPAGE=http://altlinux.org/index.php?module=sisyphus&package=libutempter
 IUSE=static-libs elibc_FreeBSD
@@ -9,4 +9,4 @@ RDEPEND=!sys-apps/utempter
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d5e88fcf2dbde7a1f2b30760918b6227
+_md5_=d37e936a03e15d840fbd1ce7ab037800
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.0 b/metadata/md5-cache/sys-libs/slang-2.3.0
index e2834be7abc8..19e6abacc6d3 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.0
+++ b/metadata/md5-cache/sys-libs/slang-2.3.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) cjk? ( >=dev-libs/oniguruma-5.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(-)?] ) readline? ( >=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(-)?] ) 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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
-DESCRIPTION=A multi-platform programmer's library designed to allow a developer to create robust software
+DESCRIPTION=Multi-platform library designed to allow a developer to create robust software
 EAPI=5
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-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
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,ab
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.0.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1dcddf3f7cfeab05847a9b19c5b52f45
+_md5_=d105f7ca5f9ab0d97712efe11fc67081
diff --git a/metadata/md5-cache/sys-libs/slang-2.3.1a b/metadata/md5-cache/sys-libs/slang-2.3.1a
index 4532df4cf49d..622e94fcb90d 100644
--- a/metadata/md5-cache/sys-libs/slang-2.3.1a
+++ b/metadata/md5-cache/sys-libs/slang-2.3.1a
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) cjk? ( >=dev-libs/oniguruma-5.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(-)?] ) readline? ( >=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(-)?] ) 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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
-DESCRIPTION=A multi-platform programmer's library designed to allow a developer to create robust software
+DESCRIPTION=Multi-platform library designed to allow a developer to create robust software
 EAPI=6
 HOMEPAGE=http://www.jedsoft.org/slang/
 IUSE=cjk pcre png readline static-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
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= pcre? ( >=dev-libs/libpcre-8.33-r1[abi_x86_32(-)?,ab
 SLOT=0
 SRC_URI=http://www.jedsoft.org/releases/slang/slang-2.3.1a.tar.bz2 http://www.jedsoft.org/releases/slang/old/slang-2.3.1a.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d3b1b519ca4d947a70e737fa293ffcaa
+_md5_=9b869344b012adaa542b83966c094f70
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 9a7699c266e3..6df88a035cfc 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/jpeg-0-r2 b/metadata/md5-cache/virtual/jpeg-0-r2
index 418b9fc52c43..cf016d88880e 100644
--- a/metadata/md5-cache/virtual/jpeg-0-r2
+++ b/metadata/md5-cache/virtual/jpeg-0-r2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DESCRIPTION=A virtual for selecting between libjpeg-turbo and IJG jpeg for source-based packages
+DESCRIPTION=Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages
 EAPI=5
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~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
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/jpeg-8d-r1:0[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cc553e07e6dc2a1bbcac4497baedfcfc
+_md5_=0db1c748e41a86a5098ce01f376f5099
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index a46664fce69c..8671fce5d307 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r1 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r1
index 13bdc68c1db4..c5becd1fd564 100644
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r1
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.8.2-r1
@@ -1,6 +1,6 @@
 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
+DESCRIPTION=mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)
 EAPI=5
 HOMEPAGE=https://mod.gnutls.org/
 IUSE=test
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.8.2.tar.bz2
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c7ef08d0e9f7d1577d004770fb738135
+_md5_=a2adfd45e9889ba9f738f09659716645
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.8.3 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
index a2df2807374e..5e53d6785718 100644
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
@@ -1,6 +1,6 @@
 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
+DESCRIPTION=mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)
 EAPI=6
 HOMEPAGE=https://mod.gnutls.org/
 IUSE=test
@@ -11,4 +11,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
+_md5_=5b053e3e621155c0c31f3aaf58a4c01b
diff --git a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1 b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
index 1145968bd5ad..b3df0fcb546c 100644
--- a/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
+++ b/metadata/md5-cache/www-apache/mod_xsendfile-1.0_beta1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst setup
 DEPEND==www-servers/apache-2*
-DESCRIPTION=Apache2 module that processes X-SENDFILE headers registered by the original output handler
+DESCRIPTION=Apache module that processes X-SENDFILE headers registered by the output handler
 EAPI=4
 HOMEPAGE=https://tn123.org/mod_xsendfile/
 KEYWORDS=amd64 sparc x86 ~amd64-linux
@@ -9,4 +9,4 @@ RDEPEND==www-servers/apache-2*
 SLOT=0
 SRC_URI=https://tn123.org/mod_xsendfile/beta/mod_xsendfile-1.0b1.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	0917334d570e07f9743a04ff85b3bf1b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7fa67ee6ecbfbd80fdb075404d0f10e6
+_md5_=bba26cdf984d1367e08fe9cecabf0fb0
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 6752f023d038..5144073d95ee 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/blazeblogger-1.2.0 b/metadata/md5-cache/www-apps/blazeblogger-1.2.0
index a8182625f184..066a84ca15ca 100644
--- a/metadata/md5-cache/www-apps/blazeblogger-1.2.0
+++ b/metadata/md5-cache/www-apps/blazeblogger-1.2.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=dev-lang/perl
-DESCRIPTION=simple-to-use, capable content management system for the cmdline producing static content
+DESCRIPTION=Simple, capable content management system for producing static content
 EAPI=4
 HOMEPAGE=http://blaze.blackened.cz/
 IUSE=doc
@@ -9,4 +9,4 @@ LICENSE=FDL-1.3 GPL-3
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://blazeblogger.googlecode.com/files/blazeblogger-1.2.0.tar.gz doc? ( https://blazeblogger.googlecode.com/files/blazeblogger-doc-1.2.0.tar.gz )
-_md5_=eb48aa3f2b9e02d6739378b275811e42
+_md5_=047427a6a8b7c28b3565606183ee3ad9
diff --git a/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1 b/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
index 62e28fd24af7..9c242ac31481 100644
--- a/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
+++ b/metadata/md5-cache/www-apps/blazeblogger-1.2.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install prepare
 DEPEND=dev-lang/perl
-DESCRIPTION=simple-to-use, capable content management system for the cmdline producing static content
+DESCRIPTION=Simple, capable content management system for producing static content
 EAPI=4
 HOMEPAGE=http://blaze.blackened.cz/
 IUSE=doc
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=https://blazeblogger.googlecode.com/files/blazeblogger-1.2.0.tar.gz doc? ( https://blazeblogger.googlecode.com/files/blazeblogger-doc-1.2.0.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4bc1297badce5453f787ded3d7883347
+_md5_=406821cd8267a7ee88684055a96cdad4
diff --git a/metadata/md5-cache/www-apps/gitea-1.2.2 b/metadata/md5-cache/www-apps/gitea-1.2.2
deleted file mode 100644
index 0f38931b4308..000000000000
--- a/metadata/md5-cache/www-apps/gitea-1.2.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/v1.2.2.tar.gz -> gitea-1.2.2.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=962e9aee03a5457189284335934905fc
diff --git a/metadata/md5-cache/www-apps/gitea-1.1.4 b/metadata/md5-cache/www-apps/gitea-1.3.0
index 682936c8d074..5aa7953208b0 100644
--- a/metadata/md5-cache/www-apps/gitea-1.1.4
+++ b/metadata/md5-cache/www-apps/gitea-1.3.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/archive/v1.1.4.tar.gz -> gitea-1.1.4.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/archive/v1.3.0.tar.gz -> gitea-1.3.0.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=44b36219d0b5b8b84954847ad16ae9f4
+_md5_=03704a9ba6fff247dbc7380b019e2dde
diff --git a/metadata/md5-cache/www-apps/lxr-0.9.8-r1 b/metadata/md5-cache/www-apps/lxr-0.9.8-r1
index eb0211daeeab..75aaa8937964 100644
--- a/metadata/md5-cache/www-apps/lxr-0.9.8-r1
+++ b/metadata/md5-cache/www-apps/lxr-0.9.8-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
 DEPEND==www-servers/apache-2* dev-lang/perl:=[-build(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=general purpose source code indexer and cross-referener with a web-based frontend
+DESCRIPTION=general purpose source code indexer and cross-referener with web-based frontend
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/lxr
 IUSE=cvs mysql postgres vhosts
@@ -10,4 +10,4 @@ RDEPEND=dev-util/ctags dev-lang/perl dev-perl/DBI dev-perl/File-MMagic cvs? ( de
 SLOT=0
 SRC_URI=mirror://sourceforge/lxr/lxr-0.9.8.tgz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=3f95dc7cb82ce561b10025fd059ebb6f
+_md5_=ab422987b7e04f6db2c7dc2120314342
diff --git a/metadata/md5-cache/www-apps/openwebstats-1.1 b/metadata/md5-cache/www-apps/openwebstats-1.1
index cfe044f5fc33..f7b3d1dfad7e 100644
--- a/metadata/md5-cache/www-apps/openwebstats-1.1
+++ b/metadata/md5-cache/www-apps/openwebstats-1.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst prerm setup
 DEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
-DESCRIPTION=PHP stats application that reads Apache log files and imports the data to a MySQL database
+DESCRIPTION=PHP stats app that reads Apache logs and imports the data into a MySQL database
 EAPI=0
 HOMEPAGE=http://openwebstats.sourceforge.net/
 IUSE=vhosts
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php >=app-admin/webapp-config-1.50.15
 SLOT=1.1
 SRC_URI=mirror://sourceforge/openwebstats/openwebstats-1.1.tar.gz
 _eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=1cee00c202392b4468afb91b87033625
+_md5_=809dbea6717dbadb1c65816f3e6b6c71
diff --git a/metadata/md5-cache/www-apps/trac-1.0.9 b/metadata/md5-cache/www-apps/trac-1.0.9
index 91c33fbe4089..0bb0cebb261c 100644
--- a/metadata/md5-cache/www-apps/trac-1.0.9
+++ b/metadata/md5-cache/www-apps/trac-1.0.9
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_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(+)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) highlight? ( || ( 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(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( 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(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-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(+)] ) 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(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[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(+)] ) test? ( dev-python/twill[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_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/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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(+)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Trac is a minimalistic web-based project management, wiki and bug/issue tracking system
+DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
 EAPI=5
 HOMEPAGE=http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac
 IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81	webapp	a76ebd3cb5649737496e8238992dd7ca	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6d470ee50e3e59c8736bd5492f25f752
+_md5_=0555a025419a995ca4617cac72b10b59
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 1c6f26d9bc84..e1ee52582e64 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/opera-developer-51.0.2776.0 b/metadata/md5-cache/www-client/opera-developer-51.0.2791.0
index 9b5839ce1f3e..c928e1c39d98 100644
--- a/metadata/md5-cache/www-client/opera-developer-51.0.2776.0
+++ b/metadata/md5-cache/www-client/opera-developer-51.0.2791.0
@@ -8,6 +8,6 @@ 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/51.0.2776.0/linux/opera-developer_51.0.2776.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/51.0.2776.0/linux/opera-developer_51.0.2776.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/51.0.2776.0/linux/opera-developer_51.0.2776.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/51.0.2776.0/linux/opera-developer_51.0.2776.0_amd64.deb )
+SRC_URI=amd64? ( http://download1.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download2.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download3.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb http://download4.operacdn.com/pub/opera-developer/51.0.2791.0/linux/opera-developer_51.0.2791.0_amd64.deb )
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	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/vivaldi-1.13.1008.34_p1 b/metadata/md5-cache/www-client/vivaldi-1.13.1008.34_p1
new file mode 100644
index 000000000000..ad60b43844a8
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-1.13.1008.34_p1
@@ -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.13.1008.34-1_amd64.deb -> vivaldi-1.13.1008.34_p1-amd64.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_1.13.1008.34-1_i386.deb -> vivaldi-1.13.1008.34_p1-i386.deb )
+_eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9c5190820b9806c131e465d0f169da2
diff --git a/metadata/md5-cache/www-client/weboob-0g b/metadata/md5-cache/www-client/weboob-0g
index d4d27cecc924..1d2453755fb2 100644
--- a/metadata/md5-cache/www-client/weboob-0g
+++ b/metadata/md5-cache/www-client/weboob-0g
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,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(-)] >=sys-apps/sed-4
-DESCRIPTION=Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites
+DESCRIPTION=Consume lots of websites without a browser (Web Outside Of Browsers)
 EAPI=5
 HOMEPAGE=http://weboob.org/
 IUSE=X +secure-updates fast-libs python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://symlink.me/attachments/download/229/weboob-0.g.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00e4a15da7848ba044954e7a47892d7f
+_md5_=44bbd7fd3dbba797c60b75cbc9a47bf3
diff --git a/metadata/md5-cache/www-client/weboob-0h b/metadata/md5-cache/www-client/weboob-0h
index c33c65223c93..e156e50f6393 100644
--- a/metadata/md5-cache/www-client/weboob-0h
+++ b/metadata/md5-cache/www-client/weboob-0h
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,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(-)] >=sys-apps/sed-4
-DESCRIPTION=Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites
+DESCRIPTION=Consume lots of websites without a browser (Web Outside Of Browsers)
 EAPI=5
 HOMEPAGE=http://weboob.org/
 IUSE=X +secure-updates fast-libs python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://symlink.me/attachments/download/235/weboob-0.h.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb10d96a3382549a7df500e90f9cebee
+_md5_=47f5ff30758f576af1d1c986ee632738
diff --git a/metadata/md5-cache/www-client/weboob-9998 b/metadata/md5-cache/www-client/weboob-9998
index 1eb5841a55ce..d6901249703d 100644
--- a/metadata/md5-cache/www-client/weboob-9998
+++ b/metadata/md5-cache/www-client/weboob-9998
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,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(-)] >=sys-apps/sed-4 dev-vcs/git
-DESCRIPTION=Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites
+DESCRIPTION=Consume lots of websites without a browser (Web Outside Of Browsers)
 EAPI=5
 HOMEPAGE=http://weboob.org/
 IUSE=X +secure-updates fast-libs python_targets_python2_7
@@ -9,4 +9,4 @@ RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00e4a15da7848ba044954e7a47892d7f
+_md5_=44bbd7fd3dbba797c60b75cbc9a47bf3
diff --git a/metadata/md5-cache/www-client/weboob-9999 b/metadata/md5-cache/www-client/weboob-9999
index 1eb5841a55ce..d6901249703d 100644
--- a/metadata/md5-cache/www-client/weboob-9999
+++ b/metadata/md5-cache/www-client/weboob-9999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,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(-)] >=sys-apps/sed-4 dev-vcs/git
-DESCRIPTION=Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites
+DESCRIPTION=Consume lots of websites without a browser (Web Outside Of Browsers)
 EAPI=5
 HOMEPAGE=http://weboob.org/
 IUSE=X +secure-updates fast-libs python_targets_python2_7
@@ -9,4 +9,4 @@ RDEPEND=X? ( >=dev-python/PyQt4-4.9.4-r1[X,phonon,python_targets_python2_7(-)?,-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00e4a15da7848ba044954e7a47892d7f
+_md5_=44bbd7fd3dbba797c60b75cbc9a47bf3
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index ad934a32401c..041dddc63438 100644
--- a/metadata/md5-cache/www-misc/Manifest.gz
+++ b/metadata/md5-cache/www-misc/Manifest.gz
diff --git a/metadata/md5-cache/www-misc/nx_util-0.52.1 b/metadata/md5-cache/www-misc/nx_util-0.52.1
index 800b6a4c1b9d..2f654558c889 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.52.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.52.1
@@ -1,6 +1,6 @@
 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(+)]
-DESCRIPTION=Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)
+DESCRIPTION=Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)
 EAPI=5
 HOMEPAGE=https://github.com/nbs-system/naxsi
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/nbs-system/naxsi/archive/0.52-1.tar.gz -> ngx_http_naxsi-0.52-1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=212c2704873e3145860cf3a2eb5bb418
+_md5_=14a9b1738d49fa546a11fcaeb2dbd9ac
diff --git a/metadata/md5-cache/www-misc/nx_util-0.53.1 b/metadata/md5-cache/www-misc/nx_util-0.53.1
index 8e2cc748b4e7..726cc392b8ad 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.53.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.53.1
@@ -1,6 +1,6 @@
 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(+)]
-DESCRIPTION=Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)
+DESCRIPTION=Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)
 EAPI=5
 HOMEPAGE=https://github.com/nbs-system/naxsi
 IUSE=python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://github.com/nbs-system/naxsi/archive/0.53-1.tar.gz -> ngx_http_naxsi-0.53-1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=edfed288f30f17b4541a3a8bfc0ab136
+_md5_=304208a44f212eb3dfbb08cf901bf994
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 2ba0ff4cf5b8..245537245ff6 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/pathod-0.10 b/metadata/md5-cache/www-servers/pathod-0.10
index 6aa0d62a0f41..da33701c950f 100644
--- a/metadata/md5-cache/www-servers/pathod-0.10
+++ b/metadata/md5-cache/www-servers/pathod-0.10
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/netlib-0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/flask[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[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 collection of pathological tools for testing and torturing HTTP clients and servers
+DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
 EAPI=5
 HOMEPAGE=http://pathod.net/
 IUSE=test python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.10.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18c3ac145668a9c8360eb3212f1cbb5e
+_md5_=b0618805bd8bc38997184d54e9888331
diff --git a/metadata/md5-cache/www-servers/pathod-0.11.1 b/metadata/md5-cache/www-servers/pathod-0.11.1
index 68cac9f71774..8ad94839a7c2 100644
--- a/metadata/md5-cache/www-servers/pathod-0.11.1
+++ b/metadata/md5-cache/www-servers/pathod-0.11.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/netlib-0.11.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[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 collection of pathological tools for testing and torturing HTTP clients and servers
+DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
 EAPI=5
 HOMEPAGE=http://pathod.net/
 IUSE=test python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.11.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=455a73674e84e349867525b3ef306df7
+_md5_=57d4778ef921218e1e216fa5ac89384d
diff --git a/metadata/md5-cache/www-servers/pathod-0.12.0 b/metadata/md5-cache/www-servers/pathod-0.12.0
index 6a08237e2363..18b2ed461960 100644
--- a/metadata/md5-cache/www-servers/pathod-0.12.0
+++ b/metadata/md5-cache/www-servers/pathod-0.12.0
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/netlib-0.12.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/nose-1.3.0[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 collection of pathological tools for testing and torturing HTTP clients and servers
+DESCRIPTION=A collection of tools for testing and torturing HTTP clients and servers
 EAPI=5
 HOMEPAGE=http://pathod.net/
 IUSE=test python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathod/pathod-0.12.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07e215d778b8cc253d870404ffae0af4
+_md5_=e10bc8f654f0f1b2764e75e6ae18cea3
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 4458fbf6b3c8..d068309c5e84 100644
--- a/metadata/md5-cache/x11-drivers/Manifest.gz
+++ b/metadata/md5-cache/x11-drivers/Manifest.gz
diff --git a/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11 b/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
index 9402417209c6..9dc6ec0f950a 100644
--- a/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
+++ b/metadata/md5-cache/x11-drivers/afb-ucode-1.3.11
@@ -1,11 +1,10 @@
 DEFINED_PHASES=install
-DESCRIPTION=Binary blob microcode for Elite3D framebuffers to use X, required by xf86-video-sunffb
-EAPI=0
+DESCRIPTION=Binary blob microcode for Elite3D framebuffers, required by xf86-video-sunffb
+EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=-* sparc
 LICENSE=MIT
 RDEPEND=x11-misc/afbinit
 SLOT=0
 SRC_URI=http://dlc.sun.com/osol/sparc-gfx/downloads/afb-ucode.tar.bz2 mirror://gentoo/afb-ucode.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=34905c5104317f47595db7bb2973e26a
+_md5_=5bd051c5a40e6d456d54657288184585
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1688e975d787..ca30ad25595e 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.15 b/metadata/md5-cache/x11-libs/libXcursor-1.1.15
index 5e842c33bdfd..8d32d8dbfe24 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.15
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.15
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xcursor library
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/
 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 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 ~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/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/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(-)?] >=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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXcursor-1.1.15.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=d46ab75b102921e1951b99bdc742a291
+_md5_=0dfe47ad121a3d79cd65d635cd6580ed
diff --git a/metadata/md5-cache/x11-libs/libXfont-1.5.4 b/metadata/md5-cache/x11-libs/libXfont-1.5.4
index 4a6e0065c530..01f7fb5e1504 100644
--- a/metadata/md5-cache/x11-libs/libXfont-1.5.4
+++ b/metadata/md5-cache/x11-libs/libXfont-1.5.4
@@ -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.4.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=c31f05b3f00d7bd3049b9e457e9ff92f
+_md5_=6ef03d73bf7e1ca49b8383ac8fd00392
diff --git a/metadata/md5-cache/x11-libs/libXfont2-2.0.3 b/metadata/md5-cache/x11-libs/libXfont2-2.0.3
index 07ded694c33e..41d2b46f31dd 100644
--- a/metadata/md5-cache/x11-libs/libXfont2-2.0.3
+++ b/metadata/md5-cache/x11-libs/libXfont2-2.0.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
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXfont2-2.0.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	a6089a2a4027ae3da4a460dc87b21050	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=81fd43bed715c6279de9888ba3a47741
+_md5_=3095c7823e419a6246c87c5814189175
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index b88793e31d6a..9b7c6e55c112 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 34188 BLAKE2B 32cc4e181d63a37168d787671b95b0d67f02097dd510b9e670aaa11654e9610f0fff06d04b6b12baa34ea52d3d0bc7928b9bb37f79dcf6d1c40b9e842925b992 SHA512 a6dd5556496c75237a730271b276457afa4d6cd49223c94c1cd210c02a9b8206730390c4b42c5de2d22de8b3f8b31c59fc24c91e9900bfdf70ec28f5fd2d05c9
-TIMESTAMP 2017-12-01T02:08:28Z
+TIMESTAMP 2017-12-01T23:08:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloguZxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAloh4PRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDHMA//XKtmeB97W8Prk9yU3oGdl1MKu8Tu3+dRDWXnEmUcneT+YEu2CDKq3FfK
-hIe/Zk3yK1LFXcf20edu5FzeK4B4sylNB5b8IpXvmfmkDTOUZVDkLHalYREQ/3oa
-qLlOB225WTC8WFrY1o0OH1N7aNMYJR8S7hD4dz0l0EiXayCsqZZrvBboPK2xB8qi
-oQ4qU8lbcAtIDS6Fa6sbp6zbVP0MCXuyk+7c5w8JVEIMzsR7dIBAitm9Y9wZSje+
-r6Fp8ZtZAxQkj5UjgXzoxCfs4eUmmlF8x5eiENBVjY9AxE4UTpQKUqMhP8+fNTrv
-GGhpse8YV7WpiFe/71o5mRtJK1OGgP+SZ2TxDh6ytgUWWmlw87wHa2AVTppRiq4P
-m3vUs8ilq/Rh9I+XOHlegE38yJLOE0REGZJ//AOspfv8TP6hl9tSqOazMANeYSfi
-mj8n2RnwjrUe8eNuypWywLuhzCJ6CyAhxQ6CX6/HBCo7Qb+cpgK1pZ64+KnK6Y0Z
-QScKT6e9sHUktRGvDzMfsAmHlIRueYmtMcxFjnnodnFhiJSxV9qX/v5rMCvKRqzC
-UYrsahmX1w/HUDu4vr/blDcxhjwwBvxJn/zK0l3dvb/8QxWOKtExTUj2HJZdd2QC
-eHdEuZ8AsK7zIjXenagIQnLCwLGN/Ma+kZuz9O3i6P7HPvG4Ag8=
-=Kaqc
+klDjmxAArFHpd7jJtt/kU91C3T+T9dkp/fl/JBf59v9jCDlK/YIMnlhRGZbHC1VB
+hUiyAr890KEq4wpsBmT9CSsUV6wEz22dKQlTjIhYSYAcUgkcK9XJ1dPpmxBiF+OS
+2UGbP4BypbBOGqA6ztexyD1xiUHPnjsyBL2271dvAvw/uHp5OMCGasD6L9Y5KRC2
+/HhFqUunaj0lTg56p3A5ivFFAhMl42QLgUSa5mDfeod5Ci3P8qxtRgl1ruITkcNn
+SeTYXAd0y2giJPW4aPqXWbU18JU1USLxsmHcNHXUQYxWXt3nUE07sfUX/9yRj2wK
+EMQJHa6s7m/Fw99mp4GyVmAo5iVNLmir4dx9e8NlkKRQiKHkyDoUqN7hj0T6VRqy
+Bg/jHjr7G69dik5xMwPghqMTaV0rtR1+xx4lqp3CWSBfjSA74yMtXhdBBqQ767/M
+NQZ1JRaCByfuZWBp2/W23h4uK1YX4gAKeP6KiEjHQch1kRv9z/1MuRTetyQ0hfEM
+kT3uH++QMx9w7VWMd1h5sTMxrCfspmADEIRsATc4A+WeU735uB5jss/GUzVLQt+O
+kiifkq6ESxbpvWGPE4ERYY3fS/UdxUrUSuXheneeHQ7hglsbh/WPzJUjOj2L2bq2
+U2S8KQ6jlQWiPfxMxdhD4pJmx59YYG1nGM5hUFtjyvhEDbtRgJc=
+=zhwV
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index dbb105b28804..0c2d29625061 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 02:08:24 +0000
+Fri, 01 Dec 2017 23:08:32 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 88b3a7ae64fb..f0e45715eb39 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Dec  1 02:08:24 UTC 2017
+Fri Dec  1 23:08:31 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 55c5290b2028..e556509367e3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 02:15:01 +0000
+Fri, 01 Dec 2017 23:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 2b6d3fd3df40..9fcf83d1ee26 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-3c8350a51546b92c3a502ace31697b577d4385f7 1512093429 2017-12-01T01:57:09+00:00
+8246fd83b9494d57555e8e0c2d31f01c798e96ee 1512169298 2017-12-01T23:01:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d1421474eaf5..9a10de3ae840 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1512093901 Fri 01 Dec 2017 02:05:01 AM UTC
+1512169501 Fri 01 Dec 2017 11:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dbb105b28804..f0111f5bf764 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 01 Dec 2017 02:08:24 +0000
+Fri, 01 Dec 2017 23:08:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 04267b6df39e..8efc8866343e 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index dcdca0711e2c..6412ced2f6bd 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -11,11 +11,11 @@ AUX rrdtool-1.6.0-configure.ac.patch 537 BLAKE2B c90a5b9e2ef8fcba87947e6091c4de0
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
-DIST rrdtool-1.6.0.tar.gz 2186538 SHA256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd WHIRLPOOL ae831bfd6b397ca77d2a7b2e393d2dc542e740f1bfb9b45eada44781a7c9dd93b80279683cca1590477191bc3972f859097802387a12c8e3b40c97f1524428d6
-DIST rrdtool-1.7.0.tar.gz 2849994 SHA256 f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f WHIRLPOOL afe313254d7ae7ac6a9a9c86f38b2f6873846d0b4419d186d4fbb14b1ff7b5b6f8d1494e6608f40daa0c2a0c24f24f3edb14cea1130c5f89bf38dddbd86c7577
+DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
+DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c79579823e025e0a0757d1dab0d2cda6387197ece20e07f33a657743350cadfaf6504500f13be472d18e8826a3f SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f
 EBUILD rrdtool-1.4.8-r1.ebuild 4038 BLAKE2B 3bf893dd39546b26280d36fc3474660ff53cad1b5538e104be1131623466a195b008073cfccd023236d3ab9c1bfee47235663b0991acc42e29d562f5fe24c20c SHA512 264d53646ed3854ce49618dfae1287bee512e8e59aefeb7a8118dbeeb4984a9e15d77fe60d07cf730e91beb5f7c356bfef3fbb4b3dbcb2efe607b709d6202b4f
-EBUILD rrdtool-1.5.5-r1.ebuild 4294 BLAKE2B d69a274c22ae2596badc441336a00bd83317b197be07a822f67a0739dc46d0fdd4604a46db2ead9e1181cf9e54280552caf0c6a1759da27ef4068824f4ac2ca7 SHA512 5737e77cfd4dd78d2f306ce7d1013861850c95414b0cf8ebf3b247ad918f06693ff6227006383b4c6f2023ffbb63e6a6737bfa932c7ea3205e66da1acfe9e14a
+EBUILD rrdtool-1.5.5-r1.ebuild 4301 BLAKE2B 049b30a1c6eb88c9629ea98fc951fc66eeeacd14944cf44020236768210e07a29bd552c2707910b292a113b0b47bb1eae9fed0d36f6c0f914c0fd1d5814aa301 SHA512 57199dbdf7eb7a38341e5106191b0e4e0076269c125e1ce76e69c94cc2c2f0e03788d541212d4ae4b05a31b2bb87119003be626b9a585e08038e13f4c13d0fc7
 EBUILD rrdtool-1.5.5.ebuild 4027 BLAKE2B 1b281d9d92463ac5027750e45d673295e914dcc32ed512d19cd9558ddf1a433aba28c918f669dd9a42d61421b44b8d44b0cbdb2110c8e716e401f3b85e57b73b SHA512 6b0346093e6787f76d018c2e8fc52d60b0f8d0e108d17a8f6cc30f91856d69d082a75555861b4c71e1c62c466eb21d2acc38bf029993972bd8b90496debcf28c
-EBUILD rrdtool-1.6.0-r1.ebuild 4247 BLAKE2B 7c4b21e293bd49f3959686e5e59102e6d87d7706f3c565fc0de5cc27e24549220d013cfc88b99e63c8abdc24d28d0938f7a93160642f39d8ea7f619212b9ee43 SHA512 0cafe4e91530e053acc774371254958d7a608cdc93fb7e6e38ba5a5229c3d3698e2e2660127a5544de36d31bb99204b92eb9eeae3e271e980f35f60b81ba2c3c
-EBUILD rrdtool-1.7.0.ebuild 4303 BLAKE2B d5d918325c627321fbda9d23f70aa7a0733333e73634c0a6c0e267e1e96a0954df7eeb1199652d1fb93fda5590bd5f7765dd4dfba67fe4326b004f34936e410b SHA512 efcc7770ddb900e1e1f3a83acbfe72b4191fe980b6d892ce0eb9fc34d75490a0f561a2796a144f79541c40d8449b1f22234a9f6014dcdb7d08163bf992353ad7
+EBUILD rrdtool-1.6.0-r1.ebuild 4254 BLAKE2B 690cb72a807dacfa5c99291ea48a86c0fc2e5960a319f154c45b004c4a7e4537b6bab7c6c1579cb33c73eba625519e25b59eeede44284483264bde5dc00002e0 SHA512 0da9052dfedd8ac5bfba5150f6508c68bd123ceb6efac59673497e07305d1d05f1181fd117b8908b1c7da28181db516efd2a1c6efaef3707eb828cba44723a5a
+EBUILD rrdtool-1.7.0.ebuild 4310 BLAKE2B 3084372a08723bf67e31eafad1b38f74a650710a1e5abbbc3c06857d21a9535d5d3d0860d3751ab431e5f09a21917a08e875e383a0ae7613932cda6a23fde083 SHA512 e7813b76116883440c66108b1b15481f7a7a3a665b39f11c3ea719372563b5e983749a9b2b2f8d61cdc808ea37230cc08e250d67a301b4271bc3819bf5d79e7e
 MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
index d9e1303a80d3..7178baae6cdf 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index ccde50143454..d13a264e077c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
index 24a80c6305f4..88256ecc9dc2 100644
--- a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index c9088e7a6337..de91815eae2b 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -4,7 +4,9 @@ AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
-EBUILD wireshark-2.2.7.ebuild 6489 BLAKE2B ef6b2cfc35890633c5936cf7513a4570b6006b92d6b5cfd504b3b097bb2f978c5c1b59253cd81b9704ba105a84f5adfdf9f9b0cc75a99f4f6a0b175fa3f1f9de SHA512 3aad3004619a02cd4a2bb8a9d4f87e0a669e2ea23a0e83377056477af4a2b5a6f7ed95d9c7fe1373e847fb186c014c87f5cb96f5f32d4bff7bfc2700710301f9
+DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
+EBUILD wireshark-2.2.7.ebuild 6439 BLAKE2B 86d89c85ae317328c1ab3fdead659c4a70ee10ca1ddef1d821752ba0a89c3d8cfcea65ceff744e3deb32dcd9b2a6126992bb0664cd6e56a969baa42e37cdae9a SHA512 19547b52dd4f3571a17c954e2d3158511e0abde89632b4b370b2d5ced306b42bf08d9eeae8747651738bc2ebe38f81c0c7193e7992a8660ac61b0c7e205c830a
 EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439
+EBUILD wireshark-2.4.3.ebuild 7255 BLAKE2B 7dae35f0eba0e32a270b3f9872b80b17d0546a2a92e2ec23ddaf71abd7962e1f4746083daea7052e71ad6131f63b64f4fb622e19d48b8c365ca8e25ac14af91e SHA512 1c2e90be967e2d6525d410576c7fe8c950455cab1b4a33643225f17efe1a92a61edc08fd60f4a815260dcd257b5914730e360ae100415e17b5559b2c8c7ff137
 EBUILD wireshark-99999999.ebuild 7112 BLAKE2B 1523fd808c7c82714c3562e430960a3665bcc92f21ff801c8cf50f9240f7f59339007d32244a54e60842849b415d36e19a9cce816bd91c11882eddc44e8e25b6 SHA512 f7fbcbadcd41ef497b2d01af12c5a6299c89d5b6554778571fba05428e0df021c03750fe40ba6aae7cf926b92fbf7cf2fc556eae64e8698b6935a9502caf8dff
 MISC metadata.xml 4696 BLAKE2B 1492ecb0d92c063457da068e82af411ffeb77d6f50f89f16d380062dcbb51a90281c3a82e59830b9e67dc3e5aabbdca8e89febbd852286f9c4bb87711210fe66 SHA512 51ab08d5390ea4d2a4b4e2ce505e9d28932c9dc08d739107e4dada664603fb1a0a89e08f2431af4f84b5f6be303b0b2ad28e2a22fecd7186497809b708be7c51
diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
index e0aadc7230b7..e28e46471220 100644
--- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt5 sbc selinux smi
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
new file mode 100644
index 000000000000..1e04b00a0180
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+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
+	+mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+	>=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 )
+"
+# We need perl for `pod2html`.  The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+	${CDEPEND}
+	dev-lang/perl
+	!<virtual/perl-Pod-Simple-3.170
+	!<perl-core/Pod-Simple-3.170
+	doc? (
+		app-doc/doxygen
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	qt5? (
+		dev-qt/linguist-tools:5
+	)
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="
+	${CDEPEND}
+	gtk? ( virtual/freedesktop-icon-theme )
+	qt5? ( virtual/freedesktop-icon-theme )
+	selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
+	if use kerberos; then
+		case $(krb5-config --libs) in
+			*-lcrypto*)
+				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+				ewarn "license and the GPL, so do your check before distributing such package."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
+		$(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
+		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
+		$(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	done
+
+	#with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
+	insinto /usr/include/wiretap
+	doins wiretap/wtap.h
+
+	if use gtk || use qt5; then
+		local c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
+		done
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	# Add group for users allowed to sniff.
+	enewgroup wireshark
+
+	if use pcap; then
+		fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+			cap_dac_read_search,cap_net_raw,cap_net_admin \
+			"${EROOT}"/usr/bin/dumpcap
+	fi
+
+	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+	ewarn "add yourself to the wireshark group. This security measure ensures"
+	ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 4889a3e8824e..6856b3ea39a7 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 97b436375702..263294c9bd0a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -6,6 +6,6 @@ DIST pdns-4.0.5.tar.bz2 1323468 BLAKE2B 7e10cc98177bfa4f81888e2598ab4f0ce83ee45e
 DIST pdns-4.1.0.tar.bz2 1116905 BLAKE2B 91ec0f0cfa70966ff71dfb6302ed01355120ca1429d3c610c4abfb1b964cff78a6332700991bc259387e9095be03d3850da41750e93bb3ffe3db0e23562d156c SHA512 4b2b42f4893f8aac3cf07a6c8a3c999cb728a5907a710f1a5c9c8d08377ecb63e202e5eececbefc069c8f1d97a29b2aa607da7cf2bcc6335a72222418e409e77
 EBUILD pdns-4.0.4-r1.ebuild 4201 BLAKE2B d54e8e387ba8b5d623bf81ac09914ff40b9dcb0cf470ed9ac47c1fafa87d0a8f7bb9a18678b5cef4f891ad229014e574267de5dbcd2a77a197afbfe907a1337f SHA512 bf382471ddb2de96a0ecff1076402c1d5a0f1b5f40d9dd61640049ef979339235549452b75b68de0fed4aac31e5bc038be77b8f8801a244d4f6e6c320c47bf7e
 EBUILD pdns-4.0.4.ebuild 4144 BLAKE2B a5a33e8b5af9d03165cd3984b4626963d8bec9ea3414164006ced76bf3b2eedf6219f79f4dd4384df819be309641be1e7474ff51bccd950a9cf72aa7fd808830 SHA512 2491bd5013165ef666ca5c077c5d6330d016ba8d87950e6875fbdf780d212624616569a708ab6bdb7016ad10bfee18605d9136541d92166253a50e4ea0729ba0
-EBUILD pdns-4.0.5.ebuild 4122 BLAKE2B 80a41ec242413b88df4097d848fb3d84e6a7596ebb172250fe64b5eb4411ddc463a829d5fb1221556158347840090acfa0bcfd119b04f101553d7bc99a470024 SHA512 8da958850313422f711f05a6b9332f35abd8478249f863e071e69d6f30a38a86b9cb4b59b2d4aa85c83962a168c888167088eacc5fb27aa3d5669a6e7688d830
+EBUILD pdns-4.0.5.ebuild 4121 BLAKE2B e6614c7eea00e1e91826a20d25c4b440e4333a500fbd661f3b7c19f795e98b6e9b5d8f68222d2186cdd77edf387ae63b6b2861d3c7f6d55d982fe0f7f8c4c3fe SHA512 c6bc8aeec70b28faec1c7b0e77245e59a4a9903d621a2fc0ae149889e1661d3c210a2bd12286834a34efbd0343a929ebaed0931143630abb1a293ce7cd92df72
 EBUILD pdns-4.1.0.ebuild 4139 BLAKE2B 3b1c1baf7910e0b72d4c27ca34efb03e87d0983ac85a400adbe76d071edb5c274c68012365ac51b2af2a0c7442675e0a69a0e18e892b5115960093252076475b SHA512 befcd3c0e7e71a73e7c46e76592b71d843ec9b042029f60c952e6b4c9e1860d85cb910d29b40e7e5740c1e88f2314756fd251dec829c146120aaad9147c47853
 MISC metadata.xml 1451 BLAKE2B 69fede20eb18ba4d8bf397c51528a5b5ea4869802215c9851b21b4f71dd3545f7eb358e5e7581e23e5b5df67b29ec96d7da0caa69719951302d614b87f90f10b SHA512 ea054e8d7bdf7d4251ce00c342fda57fc3785a7ba8a8cd3ccd95c86eb8e1b5fbe155997210b67f65bcddab81e39ae136a99e61adf32de55e066d81f89ea50323
diff --git a/net-dns/pdns/pdns-4.0.5.ebuild b/net-dns/pdns/pdns-4.0.5.ebuild
index 891179a4bdbb..90ac1b5b3306 100644
--- a/net-dns/pdns/pdns-4.0.5.ebuild
+++ b/net-dns/pdns/pdns-4.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index cf59d9a343a8..6b317f13117d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3937f14a799a..c27a263d4e5e 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -4,13 +4,13 @@ AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r1 1637 BLAKE2B 046896f6eaf0a9311a9b3cb7cc6360f4bffaee95067efded8358e1a925da5468e3aa3eed972818aa171ea14c0a3625793588ba6853968cc541a942ccc3597f92 SHA512 cbfafe8210cc3d86d417d590fa6c54924ef9f3487c3766a17fffb34d2421a5fc2dfb98ce53dcc33c5811e7c2fd428a235bfde68d999cb50c7d9e5100f769a37b
 AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe
-DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
+DIST chrony-2.3.tar.gz 355113 BLAKE2B 238269a79288186e93bd978bca1fb3258d35cfd72c0a90f888cdb35d0c5c01abbb80002e476478fd0fbc6fd1a080f68e0b6d2d11f13d9a37dff1c1068c13bd13 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080
 DIST chrony-2.4.1.tar.gz 390641 SHA256 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d WHIRLPOOL ed2c2ac8e11371e009d3e96553bb73e58b410bb38e6123a9e39a3451e5dc6860d981d45e67b4e2dc47b39f616f95146feb35efd15dbaa90932f07837172c440a
 DIST chrony-3.1.tar.gz 424109 SHA256 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427 WHIRLPOOL d1b499bbcdd74a049c972c183d4b88365db4c6512d8011ca8b87f15c4e0d1bc882bde4f742591f5cfe49e820a5884f6b1960d132d5787be02a36bd57b9e2605f
 DIST chrony-3.2.tar.gz 433882 SHA256 329f6718dd8c3ece3eee78be1f4821cbbeb62608e7d23f25da293cfa433c4116 SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4 WHIRLPOOL b8a9045c81970653393c2afadece1e3a5e093c893b7ac3bae061bbd40bc043439e426df8da6598e36ef9589b4dd402419199307a9bfa48df526206952814667e
 EBUILD chrony-2.3.ebuild 2724 BLAKE2B 57d4c8cb25615542f0b9e9a3678a71124982c1949bf8a78c71f649b706c60ac3ee5a61a17e27e3edee3eceeed1403532b324cb71e6bce4ef35ce1f230c98b29e SHA512 4509bb5db4d0f17fdb4951805b118fc044c0a79897b3b0d5522d0570cf95f6f37513dcace1b689e32127ea24a77567c3b14f7da91d9333c2fcaa76e4c2de0b24
 EBUILD chrony-2.4.1.ebuild 2817 BLAKE2B 524e7ee9f65cb867ebdf494cd93c839f28c0355aa221ddbe0a77cc981c25a255b5081f4b4b7c05813c6d8ae827cc7abb9ee08497bc66dbb987d6ef02f18644c6 SHA512 1bb4017e67ca5c2222a9bd6e113d2821f288fb20ddabbd7af08993ed694fb8a1a71fff260ae1718a0219ce76ae7d86521e7ab61326f5475394826dfe1550de75
-EBUILD chrony-3.1.ebuild 2828 BLAKE2B ddb4b9e163b4e662742ef5b332504a519a0767aabca3721b6fa47f7c09517ed03a41d546508e0a14be2330da223b57d22a7861a7738610481c66cdb395f613f4 SHA512 406b67c7d4ac17d79e291aacf97216fb78c70119b270cc8e835b6ce7bb3ba6137b390ce7a0d9f31b08bcb698cc12e9484bda6c3ea56170ff4a6d7f92c7ff9e61
+EBUILD chrony-3.1.ebuild 2827 BLAKE2B 5c2e20b5a57576c040b3b4db7e4edf94767575d0268fa5c46941a50f5936f517ff1e742c91528321021e64c0ee075cc59499b0c34bd8bd07b969ac6fdfbd4336 SHA512 199544f53f31464eb214b72ab16afa73212e4c2fceede8a4b578acad69f4600a3a56c3de2b9a4172c5b7a386a9401561a935f3d6e253025121cfdd64b9313c46
 EBUILD chrony-3.2.ebuild 2912 BLAKE2B de9d8eda478642e023ac95abc3009930644354ce75e145d989a003a61c1273ddb17e2a29255cab98199cc74c07553f866a85355b9255ed26a276abdbbaa08b34 SHA512 846d29b2b4fb9ff2c250a0d07a5b31ddba0e0c8e08ec625535ae7143f271f6f751a155768ddc91f474f75b677bf158709304b38c43e904a51220ca6f2b2bc612
 EBUILD chrony-9999.ebuild 2796 BLAKE2B 24f9468445a0b1bd820740c97d7d764825bdda4ce7e271a6e18ef48b05f5d692ead4d6f248dfbc5ab22373a6b06e106722faba7c8c1c42bd61e2d726b2c46997 SHA512 9d662c832a48613a7de249e4444cd0fc6f4440826e4d2cd0c6630927e8a1b179a21f341931899bb970addfb3c5b380738ac76f443dab665909d09925c5315f2a
 MISC metadata.xml 1566 BLAKE2B 94f800f032197823ff746e93dcb8955a273a0712add991415852d5192c09b465aad40aca121f959442b83fd225becacb063f4ac28b8a7bd035ca65aab2ed3ecb SHA512 bc9d33fa4f146feb7b934ffa6cf8e4d235316f23b9e08dbd6bf6d071496508a9c1dfbed2fca686244360ef848acdeec0d3b96992601aeb669c30482f9ca5ee84
diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild
index a69815d84f8a..25f2e711b846 100644
--- a/net-misc/chrony/chrony-3.1.ebuild
+++ b/net-misc/chrony/chrony-3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8f8dc4aaa5cc..9241a537a0d5 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -9,5 +9,5 @@ DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f852
 EBUILD curl-7.55.1.ebuild 7028 BLAKE2B b7650982b49d90dc8db372c817c3608e1ed5201eaedababa27b9ab43c207221bf3693d5cfd26bce63301ca4bf156afff0488d4c310a6ad4b652d6456409f7b27 SHA512 84861e9e5edb6622c58c1a68f44365026ce328fbf26cab05948fdb7e6b7975328b0f46cbf18a2f749dfdb93727981d1147680d5235af0a36aebd6be74da666c6
 EBUILD curl-7.56.0.ebuild 6968 BLAKE2B ba29862a22558fe61a7bbab98fec997873b98d59f51ebe3f5a5907e16ab58ccab51a5aa95a26e73bc1e8bfde20012c645616b3d101350355d20b3e69a63b6e94 SHA512 a5d04df77ee897e1f516a9ae885dc76a5a575ab29afa6d5396d6667e5a081399c3dd6f2961464eb0a50dfa1cfdc72f4ae4eaf30b9fa9d85e152516aed39f2df5
 EBUILD curl-7.56.1.ebuild 7164 BLAKE2B 6229f6e3323ef17bde7aa5b6b3228d62e2ea8f47de7de4e6d7b744f976ab6820255ca6af749101e426f1c8222aaf15921726759e38f05fdcbfa263961828ea95 SHA512 1514f78468f071e65eca8895b6c0a4bbafd4675a75f7a11738758f8a71b95d9f0d405310ea556c732656622629102207c71afe121654f1c280d553737a293914
-EBUILD curl-7.57.0.ebuild 7189 BLAKE2B 6f28ba28f5ec472cabfdb16154373d8d5f4d6a910518dfb24616ba051136e1d54b69320319e7a815f01556d5eb81af866a19774f1dedfe04a28a6d7719911594 SHA512 3649c670b9e98e502f0a90bbd94cc69f91971f84686e3a3675bb21c1a40d7f7eab16ad5b78785491fcffc2655c76adb988ae2af61aa221013b64b0a187bf2069
+EBUILD curl-7.57.0.ebuild 7188 BLAKE2B 52530c8540691e8742915de8daa3eced7bbea4942969a1d95a041294db59b6d1082515c7005293e2c754b236a9447c73afef4a29854b22e565d49ee5c83447cb SHA512 56548738594655ff096458e11049ccbd75ef3e6d1acb88d0cbda89f78c8c1f4c9efbdcd8b382687468d84a649f8ad300838c5ebb8c6d7d4db16c9d155b116f5b
 MISC metadata.xml 837 BLAKE2B 1f3436d7a90c4807a7399367c051aa644604daa46f9090f3cf4b12b4159a5f34d566e660288da7849ec7e8a51661fc71109ae3370d1b87e41842ca3713f7f076 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0
diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
index 722418f71a32..67580193efe8 100644
--- a/net-misc/curl/curl-7.57.0.ebuild
+++ b/net-misc/curl/curl-7.57.0.ebuild
@@ -11,7 +11,7 @@ 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-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="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"
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index be148adadb9e..cfe3d989e2cd 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -15,5 +15,5 @@ DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b0
 DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
 EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
-EBUILD quagga-1.2.2.ebuild 3647 BLAKE2B a8efa0d6375ab32edae0b0ed76e265ac9cb3242c6728dff37bc5ed9c8419b74af72c5cf0a7a66433bd01c5b182b6b22e0c1167fa1dedfaf5e5fb145cd8569d24 SHA512 2c4fdfff487cf0ba7d31994b2908cd02d6e84f2c386f6b5464569b9cd3be2daedfd70c28c72c28e4b923c3c0abf9072c6aa6617359d7ad43945d15d13347635b
+EBUILD quagga-1.2.2.ebuild 3646 BLAKE2B b19200bcd8dacfdcf3687f4d9314877aee51227205dc8212ea323fe0f364a9654977d194ff15bd95c3fefe7beae846c64b034cfe59f424ce638474a6b6e01b2a SHA512 d83d37e25766cb9dbad1c3865d80f77cc250d414568337c0c29ef2f364eb0e1198338e90453672e2160dd872ad2e95d42e0cdd89d7ee0b4b4ba4e787d18548e1
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index 0b061a38a75e..db05f0525756 100644
--- a/net-misc/quagga/quagga-1.2.2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
 
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cbb69e3da4ce..4919d1fa75b4 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -4,7 +4,7 @@ DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d
 DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
 DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0a321c8a3bd4343832ed9b83d2d404 SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 WHIRLPOOL c843519b90faf440e1ef6c2a5cd2e4a64fe7044e76f55be26ca61ff54d8ca0ee5f4c2e9e827df27a2af03351d1532ccb22a36010f0420cd7ee476dc451650e6f
 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
+DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
 EBUILD unison-2.48.3.ebuild 2194 BLAKE2B 590546036daed25edc337019f84901be17551218068f65a789f8f2fe5dd044cf2f4513a73a72ed74bf9d1d65d6d9860d747e7948be923014a88d526cbd49bd2f SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7
-EBUILD unison-2.48.4.ebuild 2330 BLAKE2B 91616bb3b2edd6b7a554eb975d33f18f8bba095fc7567559e053a5800057cb334deead3b25004ca7eb3ac8d181e4d943b1cce2680c9f003a17e56d3237a92a3b SHA512 22857d074ba34c63342927e21b5774d6bbe4da10ff23b63e55784d056477a1c21b9b9c92a422c4623977c67e3989b072927b171cee00802797844bc03e79e2e9
+EBUILD unison-2.48.4.ebuild 2340 BLAKE2B f1b987d26e21e57d2b61705d836682dcd9978c3cd3fcb168513ac31194b44e00d64823c995975a013235bac5c46ce60102647f6480db9566fc4cd8c7f917f21f SHA512 a3c93fffb945f29a9704f2369255e53a2f462d718c2ec16554b4c97006be127da4b5e6a0017763fa9501ff5474936cd467fa60d48bc1ffd8eb367cedfee21802
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index 951e84771c95..869fd068845d 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -63,7 +63,7 @@ src_compile() {
 }
 
 src_test() {
-	emake selftest
+	emake selftest CFLAGS=""
 }
 
 src_install () {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 305d6cd1010d..85515d34bde8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 79512457ff4d..4d111697c26f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Ulrich Müller <ulm@gentoo.org> (01 Dec 2017)
+# Major breakage (network access in upstream configure), bug #639438.
+dev-db/qt5-sqlcipher
+=net-im/openmittsu-0.9.9.48
+
+# Alexey Shvetsov <alexxy@gentoo.org> (01 Dec 2017)
+# Mask beta gromacs version
+=sci-chemistry/gromacs-2018_beta*
+
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Dec 2017)
 # Dead upstream, depends on dead kdelibs4/qt4.
 # Masked for removal in 30 days. Bug #634138
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index f3498a551b4d..dae3af845f76 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -16,6 +16,7 @@ app-text/pdftk
 dev-java/ecj-gcj
 dev-java/gcj-jdk
 <dev-util/nvidia-cuda-toolkit-9
+<dev-util/nvidia-cuda-sdk-9
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following packages require pdftk and are therefore
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index d95b5b9f3a60..6c372bfc6497 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
+# This version of blender uses only old cuda which is
+# masked in the 17.0 profiles.
+# The opensubdiv USE requires cuda making it an impossible combination
+=media-gfx/blender-2.78a-r1 cuda opensubdiv
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
 # Unmask default-PIE on 17.0 profiles.
 sys-devel/gcc -pie
@@ -15,3 +21,8 @@ dev-qt/qtwebkit:4 icu
 # that prevent the >=icu-59 dependency
 >=www-client/chromium-62.0.3202.9 -system-icu
 >=www-client/firefox-56.0 -system-icu
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (1 Dec 2017)
+# The following need pdftk, which is masked now
+app-text/getxbook pdf
+dev-util/diffoscope pdf
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 26390ee773d4..3267e766ac7a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -457,6 +457,7 @@ app-emulation/bochs:avx - Enable support for emulating Advanced Vector Extension
 app-emulation/bochs:debugger - Enable debugger (slows down emulation)
 app-emulation/bochs:gdb - Enable support for the remote GDB stub
 app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs
+app-emulation/containerd:btrfs - Support for BTRFS snapshot driver
 app-emulation/crossover-bin:capi - Enable ISDN support via CAPI
 app-emulation/docker:apparmor - Enable AppArmor support.
 app-emulation/docker:aufs - Enables dependencies for the "aufs" graph driver, including necessary kernel flags.
@@ -7027,6 +7028,7 @@ sci-chemistry/gromacs:hwloc - Enable HWLoc lib support
 sci-chemistry/gromacs:make-symlinks - Create symbolic links for pre-5.0 binary names
 sci-chemistry/gromacs:mkl - Use sci-libs/mkl for fft, blas, lapack routines
 sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
+sci-chemistry/gromacs:opencl - Enable opencl non-bonded kernels
 sci-chemistry/gromacs:single-precision - Single precision version of gromacs (default)
 sci-chemistry/gromacs:tng - Enable new trajectory format - tng
 sci-chemistry/gsim:emf - Support for .emf export
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 3ffbf99dca28..515f77421774 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index f98e1e7a611a..f8cd6987508d 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,8 +1,10 @@
+AUX gromacs-2018-fix-build.patch 2797 BLAKE2B 410cf7dd4fe6f47dcdc0ce828884accc8c9f6e973ea130f20a9bf74b153e1ce118ac9c808e7305aad01cce947dd7e1546617becc61e0626278f67c6dce6fa454 SHA512 229dfb531d0bc240fca8e4548b5a3afd8280e7ebbe8006f6da9f59108469808b25ba90b7145ceb8f50e99adc93385daafc97f594ebd86ab11bf683f7e8af44c7
 DIST gromacs-2016.1.tar.gz 27336258 SHA256 9e7d2892a903777b982bc9ab4306de969d92cb45b51a562f523ec5fe58db41e3 SHA512 d30a4ad5faa6e12c95b8e94acaabc387d9aab3780490f5442c48ccac2f86bef6dca60df5bb6097dbc68ab28e6f1a15e234e1244606afdf12a841b88ece65c97b WHIRLPOOL 4be9c84d99286889dda23d9f1e2dd7b2d87a70740fb686bd58e59155771e897471d0920b02c5ec529a01a4b01428ebb2ca5b27e4d8df9034d2d3b33c5ab1a1ca
 DIST gromacs-2016.2.tar.gz 27339623 SHA256 b6ac3632b848ab0c19f8f319dd5b58fcd09b8e2005ee7509478606613e5409a5 SHA512 f5e74bb8c126823c90d205ac0f0835e61fdd13a4550bc15aa9c972ee9b187f6451cdc90877c17276d2f889d61abb5eaa5ea1b54f7cbf3da67074146c749c1aa6 WHIRLPOOL 698c4d4e67266483be4f1047eb947b243b5c8caa3c5e30bdab6b5f0dd302bb51ac5aa6e3a3357beab567cf71c1b8ecc1f9684a89754d18f963dd6f5fc90a33f4
 DIST gromacs-2016.3.tar.gz 27342692 SHA256 7bf00e74a9d38b7cef9356141d20e4ba9387289cbbfd4d11be479ef932d77d27 SHA512 16593df0a52620766fb86cfeb16328793503f860cb07cdbbd503ba7f41e6430efb4848389b7179ca3907b57311162666d05224b454e1afb1b74b220f38498d86 WHIRLPOOL dfe31f212545ae2baf7373fde31f715a8df203d098d3ace915d4269b7bf16d06a1f91ead33ccbf8a17e9e0091b593818d0ce2eff151ce532238a8c27f5e20cda
 DIST gromacs-2016.4.tar.gz 27368706 SHA256 4be9d3bfda0bdf3b5c53041e0b8344f7d22b75128759d9bfa9442fe65c289264 SHA512 69661d2a7a8a5259be277de35e2baa4b688d1f7bef225fc7d733a9b00c6ee135dcbad517c7c9f751121647c2fbd085f2c9cdf22dbd941c7ebc5d3b09e7e08f1f WHIRLPOOL c1586377d2a27f0b529370efb63e09ecca64cdb3d418fe9bc4f3ea1ff82ff5293d159834f4ed5d0136d801095d6f4085722e0d91bce873776fa4549853497ff7
 DIST gromacs-2016.tar.gz 27321561 SHA256 aa0a27cd13050a4b70aacfbd169ddce2fe507c7e668f460ecf6cf32afcac5771 SHA512 756771baaa85a1d16e7d5b8e4c96bbd1c04c7acdc536a253886cff186316330f06d60d206a0159efb15f47f161c779d3757dc5dbceab8c097241c1382d376201 WHIRLPOOL 1cc3d3797e1aaf93e1e0cb2e71173896e33fee2bb03f4e97e06be3ab85842e6da3feaf8701425358f1d701e00159ff6ce3b24fa1488d5e8ef70a1acbb914361c
+DIST gromacs-2018-beta1.tar.gz 29857800 BLAKE2B 221ed414c1dc73b59df27dfb6dd22ef094152bba7a8346cd0d0164e9a0aa5463a7d836dfb13e98ac8cdbef2ae4a0503763a5c445a5e1c73815b3592d8b8f97fe SHA512 6e827b7b33589ccc7ef1d237c4e8ce06749a2c47f59956d383fdb59439a34874a9e0e3a3cca1d209425353a7dcf0f963de035dd0281d4c8aad0c921e6bbc7b93
 DIST gromacs-5.0.4.tar.gz 26342095 SHA256 78068eeccc0b950018ddb45c41280e53c8bedae4639dca48e17c940f8896b23b SHA512 bc62b623bf71dcaa948aaf7563a3d3afa973da0702062848a20323db202e862dcee413197dacd1472866ccb40fce7709e283177b1c6c49514064f23e6c46b5ee WHIRLPOOL d8458d3d563e015e830622ae0c924e896765a6329ffe4cb1a31c7aef3c804f392d29e3f1db5617051e85058403422f7d69a160a6c7cc810564696d88f9d50bd4
 DIST gromacs-5.1.3.tar.gz 27095702 SHA256 c962d9446939a9ba9905e7ca440c9306fd310f08600da3b744806bfd0eacccde SHA512 9ab26e1b2268f8d567b89b2d99d0b75b937b28edceaec56d17ca3243c76faa31255ffc0c45d762c7c693fe500b00e36ad43b80572d1d7f92dc87f9d2d98c0ba6 WHIRLPOOL bdd9c63ceb5e61963c4edd0af815cc34a3f237d8dee410c834b9b55bb82374de65b437828390a668282e50428b9907b887cd5265caf2a2007fc7673e7ab23733
 DIST regressiontests-2016.1.tar.gz 67094518 SHA256 10c9f50ff3cb32cf629aa35e35d957965dcfce4af84a6569e6d65a16c4e09eb7 SHA512 fc01c802d81400373a147171881f3b7b9309402e8ffb08287ba393aefbb701ba93bbe0b9549ff6fa264a8befbba445c2d2c7450633063a724f78ec8ca81ae8c9 WHIRLPOOL e8c54164558fcbaa1e65e9280e438882c96bbbaa6c9389a2ee5aed37d70b83b6b36e95dd5141b4e64b303e3799411ee01cf04aa919f25014d172011e49714126
@@ -10,6 +12,7 @@ DIST regressiontests-2016.2.tar.gz 67095329 SHA256 53fa9ad062cc3e269fc6186db1ccb
 DIST regressiontests-2016.3.tar.gz 67093968 SHA256 a3d1b09acfc61820dddd765a381f706190b4657606488f1e676becb859ea7ecc SHA512 ee87df9f339954da0e1f1b4c8b8d4deb574f3b73d174010a295a7a0e8bc462ead7691090ea7cf8ac3d984a6cd70f1cd22c3592fa161b2967061ae5ba2796286b WHIRLPOOL 2e986136f7faf6db108bc79e6fb6db9fe81d05f5af8bc27037b80cd25869f7cd4162d5cabc03994b36c71945910be79a217ff27f61463d1548cbdff6acd99f56
 DIST regressiontests-2016.4.tar.gz 67643648 SHA256 d58d1a2a53c22c06e2dc03bd98ae1eea0a0d51696a1f20f635dfc394fa3da957 SHA512 367438b897a05e1cc0dcd1d3872fb6a0e9ff6b1146e9448d941d6517dce789f0c478d20cf0a4f3565070f132dc88872441aadb8b499f59efa0e1e4a6dd6a7135 WHIRLPOOL 695a3b7f81915247a90e95c0a83823c0297fba6ae6266195e86c61ec540ca58afd8d01ba236c5ddb3f44b41fb9301ba6a836b15cad1875bae42ba6276670daff
 DIST regressiontests-2016.tar.gz 66908712 SHA256 30a72362f011fd9e3a8d33004018126f938536c13fcb70f590afc74beaec5406 SHA512 59902c1973c33ea8f003f21a737dc7cc64da3258112322eedc9834b53628134a6817d5ee5b3950c9bfd97a3a0580aef88ddef0609ef2c58693c96c7575651e01 WHIRLPOOL 9d210aed00ddfa57df47733169997ef04dec84c524eb5a9c5c6dd9b05ad9ec2d7f3c8a5a43f2ade9be166d80f35a260c04b1a48ac092f5969a213475bb63ae20
+DIST regressiontests-2018-beta1.tar.gz 67870909 BLAKE2B e9aff43331394c4a50cbc626d0327498f1571cf457e6b924f0cfe8eb688a9cd8d2b66c13c900da8737b124861fb567f9129aff840a294e92233b9a2214ff20d7 SHA512 509175cbbb8528d9bb1394c726c6e89291c2077880a3c4bf99a330ff457ca233ae74e771b8a753b0c94bba8de02840b1e5460b7c226e177742b1dee289833c0f
 DIST regressiontests-5.0.4.tar.gz 65193251 SHA256 89ad9bc067035ac8f340319b538c446983d937b910067e871911d7afe2ecb3f0 SHA512 747725fa28c1c9525596bdeeb8809e45268e19036c11dac67d043aa1c51748688ca37eb6014eb7e819eb927a8b9ca2631d0ace4cdff8ed491b08c316c530ab65 WHIRLPOOL e15ccab0a0beefac41aeff11e2e596e971167f1590eed159ff82c4a8e3aec1d234287be597026951904ecfe6099f30ef3bcd48f2098b9f5201bde62e15fbc4f9
 DIST regressiontests-5.1.3.tar.gz 66994083 SHA256 fd5797dcfd29f7ae70857a438dcd4200a8006fce222f297892c8e90123993ebc SHA512 486e86eb3b75bae822abe82dac4e1098aa13723bd04214021f835a2f0b847303f015a9ececc33aa5ae63d31a2eeae07e512f22464b6c0e26d1286b0781578022 WHIRLPOOL 6ddb76859ee8fa3aba4d995e397970e6fd270acbdd6cc07ab77de0aebb0bfdbd2bd1107ae39d4410e750641047ae4b75c703eafad95a57ff42deb3bf1c742d08
 EBUILD gromacs-2016.1.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
@@ -18,10 +21,12 @@ EBUILD gromacs-2016.3.ebuild 7974 BLAKE2B ec37b1dbbbbe9c3aab0d7819f48c15e7c29d28
 EBUILD gromacs-2016.4.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
 EBUILD gromacs-2016.9999.ebuild 7987 BLAKE2B 45d8b50b3ee54c8c701eb8c6533c1dc7d680eb0f5c40cdf1a75e81b59bd2d603b4235f6e4942e40211b748b7cf8239c90f8d613b20bdc44fca48d23f9c45ae14 SHA512 ce2b0d2730e87831a517468033cada7097ba431d8a60dcef77a04c9e05bf4cfacb6eb500a5196e378f4c69e5020f8e9f871eac6e61dd2776834aee006ecb167f
 EBUILD gromacs-2016.ebuild 7968 BLAKE2B c0ba44661dce5ccda3c2378fad57e88ca90d15cb1914d6214ee4559e8ebd6c6c700624b32abf168a4a653cc5794fac9fab71024a9b7bc5464d404d768ac74ef1 SHA512 3ca5d4ae9b01a106b279bc828e42366a017b9517a450b773b944c6d12dce64199e3a80d280e4c475c637c70009a1a0fd1ca74f99b03f08067a10d9e9ad450d8f
+EBUILD gromacs-2018.9999.ebuild 7899 BLAKE2B 8053de4c12e2201d37e8d0a077d33fc0b103b79d73379488c46bc638ba763b55ebf69ae53180ffd850e4b860fc03a1c3ec57049f1b257e04e0322ed482afcd51 SHA512 734710474160c6a55206b332e5370bd9e2d0092aed19c4c1ccab7f5d9567eac2a47d163a50aa607f8c7e8e2ccc6eadeb9b394e9f638ac85eafe5f74ced68fd02
+EBUILD gromacs-2018_beta1.ebuild 7955 BLAKE2B c26e1b835fa94c9e7531a292a6aa79a3a0659fea032085a02b1aff77ce71388017760a4be5bd72bc5a41cf688489ba78e5d6ab134b4c086300e2c0c2f9b36f01 SHA512 5c14d982e7db5ec1727df4d4a8578c5b28cbc0d8f192d20fd18cc88efdf2bf3f26ead61c08136227d8f043f726967a84bc5f252a2da830852cf8c396a3bd1d98
 EBUILD gromacs-4.6.9999.ebuild 8110 BLAKE2B dd8ac9cbc4abfcc75a3a188c59cdbe5111f363404ff5a787f64b05d4bd411deebb50f172f09963800ed87997788b2e678617805e65a523bed19aa6ef18fe2b96 SHA512 2206e257f0b29b6f3a90c5d7739079b9add3e04f2a3acbd58c814811b389b5d51b3594815a94529d1de43deb380504029c302d18fc16d63a81c92727254e863e
 EBUILD gromacs-5.0.4.ebuild 8429 BLAKE2B c06c423365fa79befd5a4f0b6314e77b96d983c84df776ce84fddc79d35ce735d856d1184e5913af0c8cd3a0c4e9087110af9bd4402e2bce1f014e64a8a585a7 SHA512 d1e91cc25c5f90bd0fbad15060cae9c8bf1235ca45a2b72521b3a4f5f091bdd7d32ec2e6ff2bb22cd3fe165092f11a24ea148ae8000b8517f0b8671f6c2af6f2
 EBUILD gromacs-5.0.9999.ebuild 8439 BLAKE2B 33d51254e62593a58c636bd902f43edc553ad11af306d1d022278b223eda15b0772097f26565df74a1118bd5b144e5b93aac09cdb995123ccbae2856889c31b2 SHA512 6756116cdeae9c21b094f74ea1b1d9f41617467dc736878cdcff27fed9f53b338830a608e23e87238d0756884799fbc5d62f02685774ea86c239ecc3e8804814
 EBUILD gromacs-5.1.3.ebuild 7783 BLAKE2B d8154b902324d1f47d4b0d4d316bb0e1154379e3c9e3732e195f269386fe9666ba546ab624df95b201c1dbf63c0d7c24cab0e5be92ac70180c53a362e37e71c9 SHA512 8cf9573ec5dfa09e283b1d50513863214ca216007ad76cce15bc54caa2f1e55de8c992db8bd4b2e4fa95bc3f5d50eef32fce78ca61bc09cae2fe37e35a4cee68
 EBUILD gromacs-5.1.9999.ebuild 7783 BLAKE2B d8154b902324d1f47d4b0d4d316bb0e1154379e3c9e3732e195f269386fe9666ba546ab624df95b201c1dbf63c0d7c24cab0e5be92ac70180c53a362e37e71c9 SHA512 8cf9573ec5dfa09e283b1d50513863214ca216007ad76cce15bc54caa2f1e55de8c992db8bd4b2e4fa95bc3f5d50eef32fce78ca61bc09cae2fe37e35a4cee68
 EBUILD gromacs-9999.ebuild 7710 BLAKE2B efd556f55dc198d8526df775fed3c2aa55fa88794ea9618a222d67886ee46371c19c7ac0b58d37c11b5e0605e08caaeb42de9883db2bdab86c8baacbc372b639 SHA512 a3cb96cf8ada5f278b4b932fafac93659ca2c65ab530337567bf87be53ddea7123e2e03c0c3fefd2faca8bc3ce9494ebf960f1fdf9cff000b548790b5e0c9d81
-MISC metadata.xml 1189 BLAKE2B a2a0750d0d6ee1de3b820d0d6864508a7eb92eddb553d8a699c281f505b9e3641b94c018664d5c4fc4300aeeab94325dbdb38b7ee3c1a2599695274357f9a272 SHA512 0152b721a378b736fdcfcf61971047e7e9b09c1a8b70e858f86ae29947a83bc3aded34fc8151758151a56785d3ee4fac469b244266a57392f49db5b673e5171d
+MISC metadata.xml 1251 BLAKE2B 324e432ebfca2fea64aa5ec331c51263422f22ef6f326f7034fd0d3e97ff0a408b8bf06e09d488fea89176b2996ec9a7f02597ef5dd65ee718c16c38298d0acb SHA512 b84b070eb8d6e264e036945c9903020cb1b9b8407c9c136ccbac0387f659c2943eb1c3f5c74c2627873bab7eb68d637152da759830f18a996aaa09e63d546e37
diff --git a/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch b/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch
new file mode 100644
index 000000000000..2ed6a19f31b0
--- /dev/null
+++ b/sci-chemistry/gromacs/files/gromacs-2018-fix-build.patch
@@ -0,0 +1,71 @@
+From 81e68584512b21ec572d2561c25a1b19982aa0be Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
+Date: Fri, 1 Dec 2017 17:12:36 +0300
+Subject: [PATCH] Fix build with cmake 3.10 on Linux
+
+Without this fix cmake will fail with
+
+-- Detecting CXX compiler ABI info - done
+-- Detecting CXX compile features
+-- Detecting CXX compile features - done
+CMake Error at cmake/gmxCTestUtilities.cmake:56 (file):
+  file STRINGS file
+  "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/DartConfiguration.tcl"
+  cannot be read.
+Call Stack (most recent call first):
+  CMakeLists.txt:89 (gmx_ctest_init)
+
+-- Performing Test CXXFLAG_STD_CXX0X
+-- Performing Test CXXFLAG_STD_CXX0X - Success
+-- Performing Test CXX11_SUPPORTED
+-- Performing Test CXX11_SUPPORTED - Success
+....
+....
+....
+-- Looking for inttypes.h
+-- Looking for inttypes.h - found
+-- <<< Gentoo configuration >>>
+Build type      Gentoo
+Install path    /usr
+Compiler flags:
+C                -march=core-avx2   -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2
+C++              -march=core-avx2   -O2 -pipe -march=native -mtune=native -mfpmath=sse -mavx2 -std=c++11
+Linker flags:
+Executable        -Wl,-O1 -Wl,--as-needed
+Module          -Wl,-O1 -Wl,--as-needed
+Shared            -Wl,-O1 -Wl,--as-needed
+
+-- Configuring incomplete, errors occurred!
+See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeOutput.log".
+See also "/var/tmp/portage/sci-chemistry/gromacs-2018_beta1/work/gromacs-2018_beta1_float/CMakeFiles/CMakeError.log".
+
+Change-Id: Ie04c2e5f5884f05c3648fed7289157e73fd8d81f
+Signed-off-by: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
+---
+ cmake/gmxCTestUtilities.cmake | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/gmxCTestUtilities.cmake b/cmake/gmxCTestUtilities.cmake
+index 89715f910..3685df648 100644
+--- a/cmake/gmxCTestUtilities.cmake
++++ b/cmake/gmxCTestUtilities.cmake
+@@ -50,10 +50,12 @@ macro (gmx_ctest_init)
+         set(MEMORYCHECK_TYPE "AddressSanitizer")
+     endif()
+     include(CTest)
+-    # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest
+-    # does not work without this...
+-    set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl")
+-    file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ")
++    if(APPLE)
++	    # At least with CMake 3.4.1 on OS X, AddressSanitizer support in CTest
++	    # does not work without this...
++	    set(_ctest_config_file "${PROJECT_BINARY_DIR}/DartConfiguration.tcl")
++	    file(STRINGS ${_ctest_config_file} _existing REGEX "^CMakeCommand: ")
++    endif()
+     if (NOT _existing)
+         file(APPEND ${_ctest_config_file} "\nCMakeCommand: ${CMAKE_COMMAND}\n")
+     endif()
+-- 
+2.15.0
+
diff --git a/sci-chemistry/gromacs/gromacs-2018.9999.ebuild b/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
new file mode 100644
index 000000000000..315835fdc606
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2018.9999.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		http://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0 )
+	hwloc? ( sys-apps/hwloc )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )"
+
+DOCS=( AUTHORS README )
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex doc)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON ${cuda}
+			-DGMX_OPENMM=OFF
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"usr/bin/GMXRC* || die
+	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "https://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2018_beta1.ebuild b/sci-chemistry/gromacs/gromacs-2018_beta1.ebuild
new file mode 100644
index 000000000000..3e0dd9b80bc9
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2018_beta1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		http://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# http://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0 )
+	hwloc? ( sys-apps/hwloc )
+	lapack? ( virtual/lapack )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )"
+
+DOCS=( AUTHORS README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2018-fix-build.patch"
+	)
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex doc)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON ${cuda}
+			-DGMX_OPENMM=OFF
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"usr/bin/GMXRC* || die
+	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "https://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/metadata.xml b/sci-chemistry/gromacs/metadata.xml
index c9beb4a5a326..844b34dd014b 100644
--- a/sci-chemistry/gromacs/metadata.xml
+++ b/sci-chemistry/gromacs/metadata.xml
@@ -15,6 +15,7 @@
 	</maintainer>
 	<use>
 		<flag name="cuda">Enable cuda non-bonded kernels</flag>
+		<flag name="opencl">Enable opencl non-bonded kernels</flag>
 		<flag name="double-precision">More precise calculations at the expense of speed</flag>
 		<flag name="single-precision">Single precision version of gromacs (default)</flag>
 		<flag name="boost">Enable external boost library</flag>
diff --git a/sci-chemistry/gsim/Manifest b/sci-chemistry/gsim/Manifest
index d21ff0525f0d..68e13788c777 100644
--- a/sci-chemistry/gsim/Manifest
+++ b/sci-chemistry/gsim/Manifest
@@ -1,5 +1,5 @@
 AUX gsim-21.3-build.conf.patch 1897 BLAKE2B 3f9d538cbe10d2abb1c366866f5f57ebd5d772025e3b3955006de553a455da45a60eb28903a64b4d6c18915ec83e43d680d38e6e755cf4180eec810cc64d9b64 SHA512 d1bd0fb6ce8279edfa5aff48ce9d7174825c17531b6d71b5fa872b744160d9c836f80c751e184b34308b05e1f7a817c4fd6b9071bab7e874ca2d59280adc8312
 DIST gsim-21.3.tar.gz 4100589 SHA256 d3dd161078862fa990b40ff5df988bb82c8469e17dda8e81eda5f1419742de47 SHA512 0a65ec416a11893fe9f249126ed8e7b9f7991dc8f02d6b62b01962de6dfabda805acdc3d7fc6939b609ff018f16cefff616f37ee906776712209460374bb225d WHIRLPOOL d8dde220a52608b5dc48e494fb1b0bad49f13f770e132641b9671cd544c951cdd03a4578bf983492dfb0b74567e51ef716ecbb828ba40b2a3385d26788b83bea
 EBUILD gsim-21.3-r1.ebuild 1794 BLAKE2B 3191cc861c77cfde8140a8ee90add2388c44a254c8d0989541fd1af40a7a65bd2ab3d3980c7aa4d1eafbe1fe65eb44757415fa63960151df8463984870c2042c SHA512 7222acbf7145886e3f4e1b6758ffba1d656edbf536e6f3caa25989812df67dbfd9794e77578394fb0a51879db8512d7be5ed119f08327ca465ad37cf5c0f786f
-EBUILD gsim-21.3.ebuild 1584 BLAKE2B 0b9b4916b59326be8c04eec345db73424d2c83d298d5a28f8a0076e5412192f23dd1899a3f98c509a4c666c85232e27cb063ebcf65b1eab7b077f8ba914d34ae SHA512 44b321797c196099c93ccf07747aed4c1d023da78edf44e3deb87a17905cf11adc15b4c20eba649337734634e80bb170bc89142e592f16e1d9d5cf4a5c78c57a
+EBUILD gsim-21.3.ebuild 1571 BLAKE2B 27d68a9642f7ed3998e967be374a1363e6ce3bfc076d2f2c3390437e9e0791499ab4f2f11fc3a4380a6a77010bec9e2a9d5003326242363680ad5213db107917 SHA512 5bd8d17eb573c3813c1ab71bf0f0b2935f3b48a818086eb09c64252ee8b67b1ca15f00cf9666f62cdbbc2f3ed82e6859ecd8725937818bb028e64d56d2756739
 MISC metadata.xml 418 BLAKE2B e3c99faf5bfb099a10a4e7629cd01b44dc0cb3237627ea73480681aa64ce425894a9f07726e626ebaf7c805c6ec6998bbae4b58f622cf5aca19c5ab50b3ce3fb SHA512 d7ff66672b3e97b217dae26956f7cb56deeded4893eee1f27ad35c203917c2ab2e820b5eed5748fc63378cc7987cb45d699e05aab9fd80c4baa5a17a472f3ff8
diff --git a/sci-chemistry/gsim/gsim-21.3.ebuild b/sci-chemistry/gsim/gsim-21.3.ebuild
index 332b51b655e0..4aa1830ac648 100644
--- a/sci-chemistry/gsim/gsim-21.3.ebuild
+++ b/sci-chemistry/gsim/gsim-21.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils qt4-r2 toolchain-funcs
 
-DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
+DESCRIPTION="Visualisation and processing of experimental and simulated NMR spectra"
 HOMEPAGE="https://sourceforge.net/projects/gsim/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/sci-chemistry/molscript/Manifest b/sci-chemistry/molscript/Manifest
index 727c8989ec6e..465b6b6b732e 100644
--- a/sci-chemistry/molscript/Manifest
+++ b/sci-chemistry/molscript/Manifest
@@ -4,5 +4,5 @@ AUX 2.1.2-prll.patch 409 BLAKE2B 83eefcd062c9904a06a69ccafa9da14578f102af96ad1b3
 AUX fix-makefile-shared.patch 2051 BLAKE2B 145edf9dc11ee0f59325fcc3e2f981de03aeaa582bea06ca80406cc88ce38971590b687aa9dd40b37fb8edd07c9b30a0f81aa20ab38dcdb02378a407ba068878 SHA512 0c12bd5aea0a6175b7647ed61ae139113329058c42cfb56105ee35af35bdab9f61adfe635a1c3322dbff00ddfcee06383bbd6bd048cc7ded1961f3997a527358
 AUX glutbitmap.h 845 BLAKE2B e5c5a6fed84021a35e132301c06efa9b877fc475a1230a58c93e9e24fb0b220cea1bcb68d411ed17897877dd3b9c4e3d6a1646906b0f09819449e6321e8f108a SHA512 a11e8c23472ed8950c8b56fdfd57ddd9c6539f427437ab26a2d3561ad388ca24a36029dee9ff6b8af759eeadf89fbd45dd10279d8089e6978eec07858624c7da
 DIST molscript-2.1.2.tar.gz 412497 SHA256 01252931f5a3542d5659ddaa4ebceaed2e75becb8ed150dfa14b59da9a63ca01 SHA512 0f82936da3123770c0fdb703094dbb5289cc39e9f9ffd034d8dba563f8d615788f67040d38158ac2f203b480c5838a7d8e71ca07bc5098181c1e3cfea26703a4 WHIRLPOOL 1588f4dd47117f8da797a8bf62a2eba071106b1faca4f79b06e3093fe76092cae54476f1a0be995e3637173561ae6003fded264dd6d3a424d235488f95085a75
-EBUILD molscript-2.1.2-r2.ebuild 1407 BLAKE2B 946053dd6b4ea7ba849255fca58af98679254b0e805e1d386beb5a2952918cd9f95dd0ce2d38c2311a173bc6f700114f5f2669b2625677bfccf666f4ef3db493 SHA512 37358b677743c89b94c7960b3c5eaa458f8bd77494d412deb6cd4f583d59848bf8eadc10bb0d6bf7e3afdac24e2abb166b07d4d2143558147b29b847e1a746cc
+EBUILD molscript-2.1.2-r2.ebuild 1389 BLAKE2B cccb057490775272bc67e4195628b95f59fbdba89645bbd461e86e681a5c834b1d6503ee9bb2e187ef324e17bff6c74fc4f1930f3779249ba9608cc50e37c87d SHA512 588e960f0ab9c4678ba16a196803293b0ef7e59c5d2f20972caa64af438e3c502a03abcf8b860fa2357dd87344762375a07a212b9492fc304f2b095194b22849
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
index 054edd99f7ff..87c16c05a6d7 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations"
+DESCRIPTION="Display 3D molecules (e.g., proteins) in schematic and detailed representations"
 HOMEPAGE="http://www.avatar.se/molscript/"
 SRC_URI="${P}.tar.gz"
 
diff --git a/sci-chemistry/msms-bin/Manifest b/sci-chemistry/msms-bin/Manifest
index cb7ff4654217..229c8762e1dd 100644
--- a/sci-chemistry/msms-bin/Manifest
+++ b/sci-chemistry/msms-bin/Manifest
@@ -1,4 +1,4 @@
 DIST msms_i86Linux2_2.6.1.tar.gz 112762 SHA256 ab4f9e60df6fe18a5ac05550bf074b287792638a818a047697ead049d8737caf SHA512 814a5b5fa760b57c773f6900d42cacc5b68a2bf16d8792aa63cfa779aeabdab4e05064b86de6fb2551194543db925d83e07cf4ef74be8c08935ef5ecc8dcfe73 WHIRLPOOL dab6bfd4e8dca59939cd9d0fd6638a3304314dec023b684a09a34eb9bf90fcdc348091af4ea0676a4bf246e30b685a97e1750e0ccfbfccc8e9a90c1cf8445994
 DIST msms_i86_64Linux2_2.6.1.tar.gz 593147 SHA256 5f0ca50360b5938e74c538e0399d582abc4a40ef4cf410e66f31a1f91e6e3e1f SHA512 630da1ae57b2d8d072247b650636a71e5ef6f07a245c8c4d07b26e20618d9c5dbaffcff563d0504b9b899ca263ba5f3458447f0e649bbfb895aea34305c1c8f8 WHIRLPOOL dff76b55ff1cd53770a4b0fc91d9c7c4f2ae7422008f1081a630965858718bd5cbb2b8e5167809f5957123fb55909e0042c9ca469596eecea7c44cb1c587f085
-EBUILD msms-bin-2.6.1-r1.ebuild 1063 BLAKE2B ea74e8704401b6ba2e984c0821a1068d96081dc4a76d22e520017d901819ae50e5a2a0654928126a46e9e4e0ac2708840f682f65435f949f6ce78e351614ee36 SHA512 e0041ed3ffab683b8be0456cfa216124d04447c9a5640e3637bfb1443bf8cebaea196c95b97bb01bd32ec22dd2c9e951564149a25fc74aa45e079a59e86abbce
+EBUILD msms-bin-2.6.1-r1.ebuild 1054 BLAKE2B 6dc62885906e5b91e824878e13b81bc43f0279d83ba0e452d16cc476249005176d12011cfaf3f77c3d69d7024f76ef7fa6449c432095137f4b73169058f23022 SHA512 855c9613f269e8b76a353bf7a5ac0ce479e1cd2302671f9d17d3e3090f01ade5dcb5ffd18fbfb3cb23ca840abd151d8ae77be822833dd61f8ababca9ad918f7e
 MISC metadata.xml 342 BLAKE2B e5edc8e8d81d013be77e02718bb4fe50564226ec1c028daad92c3c5b882b2eb840be28ce78dfc83ab3a58e1a428b55caed99971b9b84a8bec23349952496eea1 SHA512 2dbd8b2bdf37d4a2d4127cb373db2c6ff8fc4de6bf294e4518f1d424115860c0b083d538935a8b1a54543b396b968985e46a7ca293367ee1a0b462d11639b7ab
diff --git a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
index 75e928623167..aaca48a6b1a8 100644
--- a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
+++ b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces"
+DESCRIPTION="MSMS very efficiently computes triangulations of Solvent Excluded Surfaces"
 HOMEPAGE="http://mgl.scripps.edu/people/sanner/html/msms_home.html"
 SRC_URI="
 			amd64? ( msms_i86_64Linux2_2.6.1.tar.gz )
diff --git a/sci-chemistry/pdb-tools/Manifest b/sci-chemistry/pdb-tools/Manifest
index 90e39ce6bd4c..71e7512de354 100644
--- a/sci-chemistry/pdb-tools/Manifest
+++ b/sci-chemistry/pdb-tools/Manifest
@@ -1,4 +1,4 @@
 DIST pdbTools_0.2.1.tar.gz 103835 SHA256 317a5246e806a2b3d0425d080d679646fc77388e3e855412527603f945fa37ae SHA512 9c43c10e8739f8a34dbb1a3bba710cc727f7d8392ff979681371bd4460c67203253fb01852438eb93b214c4a009789608d200ca551f30399652fb76d702cf724 WHIRLPOOL 36d8cf71ba9f9b28e3ad59828539f4e94bbb8bc4514f050ddcbec63857b154ecdc7c32c2945c0d15f4d718c4fe5ab3adcb2e62a4368bfd819b80e9641a9dfd88
-EBUILD pdb-tools-0.2.1-r1.ebuild 1675 BLAKE2B 9267443f3b6454299828bc846a476046081d1bf4e2942cd68dd3dce44f80fe64c2a5d672acaffb088132fe80cd7e9675827eb3ffd7fef50d3af535bcd15714c4 SHA512 f356c319d545920d550bdee48fd84ceebc7ad022d3dc58c28c79060da2aeb953c87328b3faeb08b6b8c4973ee9dd2b97a42a857ef51b1b4949b91a5333f9d147
-EBUILD pdb-tools-0.2.1-r2.ebuild 1740 BLAKE2B 6106258c22dc7df8fb9a4508bc16063ec8ce665000c3faf3193b90e5b8bbe7ccedb488665b9aee3b5f7c1a681cb638087e33427519a2fa786c78346d203f8389 SHA512 06ce18d1f7aaa9b2e4e1f8c29fa7e187737af741ee53570a65b41b28c9bdb3ba23e8cda4b37d70fb169eed84829ebf425c22193bef587dbc87dbbdfec2a8f30b
+EBUILD pdb-tools-0.2.1-r1.ebuild 1669 BLAKE2B 6fb471e4908d4aed5efb4b5129ca4a54f2f45d6b8d0c1cc716bba8a8ce20cb9ecc64cd91223cf5b2a39714e3c2e2d0a8d7d5baafb8c1fb8ac1be485f651ae457 SHA512 806c9517f124a674bf4772d6f3e6379da075760a4b6cd60d00676410d3419306d73d367fbf95462fa9515589cdef94f1b4fae6e69249955d1dfe2bf0a89123ac
+EBUILD pdb-tools-0.2.1-r2.ebuild 1734 BLAKE2B f1b28c6b9c60c5573c9bf6ab092c32f3e4aa6df7bc484dca74aeda8c12f78dafcd94db9f1976932264be4be24c01f29a38750cfe1081058fe0e964345bfe9565 SHA512 dd9a534af4c275a3fba95ce88e4a9e22e5f182c63210717fb66ab62afd67e179541e58d6d1a3af03a550f5718166f9d0974f7d2f47b401adf670b27376f73cf8
 MISC metadata.xml 413 BLAKE2B f3fc199d95acf174f2d5cf9e0ea9c645e3b49e7241122bde730db90a095a0ef0f763dd3dcbcd5f14c1da520630c58bf9e7fe40828d267cb5a2ad5c796b72993e SHA512 74abf290517514aa17fadf8271d2af124fef766b473199502959a662d3bf7a8fed59746b43b3084b83bc14f8d5b9048b419f59d901dec100cbdd81975864cce2
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
index 88c1f246e8a2..8dc55d31e546 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit fortran-2 python-single-r1 toolchain-funcs
 
 MY_PN="pdbTools"
 
-DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
+DESCRIPTION="Tools for manipulating and calculations on wwPDB macromolecule structure files"
 HOMEPAGE="https://github.com/harmslab/pdbtools"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}_${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
index 35910807746f..a476a801611a 100644
--- a/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
+++ b/sci-chemistry/pdb-tools/pdb-tools-0.2.1-r2.ebuild
@@ -9,7 +9,7 @@ inherit fortran-2 python-single-r1 toolchain-funcs
 
 MY_PN="pdbTools"
 
-DESCRIPTION="Tools for manipulating and doing calculations on wwPDB macromolecule structure files"
+DESCRIPTION="Tools for manipulating and calculations on wwPDB macromolecule structure files"
 HOMEPAGE="https://github.com/harmslab/pdbtools"
 SRC_URI="https://${PN}.googlecode.com/files/${MY_PN}_${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdb2pqr/Manifest b/sci-chemistry/pdb2pqr/Manifest
index f54e2d263607..f2c9db478630 100644
--- a/sci-chemistry/pdb2pqr/Manifest
+++ b/sci-chemistry/pdb2pqr/Manifest
@@ -3,5 +3,5 @@ AUX pdb2pqr 263 BLAKE2B 3cbd33cf9fb9fd6469c71d8d167ed0fb85ad7b87b6caf27dabb2490b
 AUX pdb2pqr-1.9.0-flags.patch 1392 BLAKE2B b6b6ac64f98944d85fc93c076d7258c8f980a0391d2cf086edc46bca3f4ef15a5cb720ef8ae2dc38007962a462fb88e92eb4f439c4f3267a5d1d83de5a848dd6 SHA512 deed0aef88dc43515745204f2b4209bd6b42702d9004d48797d642b8f497229424bd0bb92017982cec54c448ea35de563bd42017cd5dc042840acae8495d135b
 AUX pdb2pqr-1.9.0-install-py.patch 578 BLAKE2B 91ad4b40ce3d13b574ad6d9ea84e55b08803fa018490a7327dae5621a371adfeda509188c049144301cbc023f4407f6c0daf7b57e7d3c10d95d78ab570a6f540 SHA512 902ad717e32790e9c691851dc4b92412f07ac79caf74b2b5794a10fa75cca7fa19e8814df4d8ba71bd2ecc98a3d777d0b79e6e43009171a32e8c99756d81d4d2
 DIST pdb2pqr-src-1.9.0.tar.gz 9051969 SHA256 d9d91bf27a023732be33d1d780ef283ae28d3b0e256c53e86c37ac001dd7ef53 SHA512 7f3f191cca9879a0e166e82700c706f8c99bb66558a218e54845f10c3324b6c45d413da80b0782d96a8d56df1463262609db075aba3768db3942cb928ee7b98f WHIRLPOOL 4a4b883200dad3e7467392e508c2372ad6876e78005da14e5747f3b7b12d0e3d5695e3cc590812b835ae67703819b201620809dff05af0a7c363c23d22046bae
-EBUILD pdb2pqr-1.9.0-r1.ebuild 2911 BLAKE2B c1e6f8d18c1d47dee8abd1b5c3ecbdb780fbf20f5c8d4f52a2d42ba510017a8b5d46e1e8b1eaf9c95de7b45bdd09ddf3526b73e5e9bd08230632721cbf11fdee SHA512 88d06dee9fcb6423a2cae4fbb8e1e175ef6b8b45bb371b556b2fd15314d2d11c5ec9ffec294f8fb814f03f2f1dfb37d92574361b9a8aa89c9c42c483a5dd79d8
+EBUILD pdb2pqr-1.9.0-r1.ebuild 2908 BLAKE2B 6d605543d94ae2ad9a0b8184854c01bc007908dcb5af30da444d6ee5ec14ffeb9a0a73c0e832ac6d7b93cd1c0f3ad797ef8a09521df9eede8f010446a3483f2b SHA512 61df8503529a0032d72c068c1abdbb54bb2ce504bcd8e02dbac080901a30dc0aff9d7a848c21f0c7e6b1108e1574fa03d9aa3a73d68f4def6a790e355ec5611e
 MISC metadata.xml 511 BLAKE2B 70a1bf9ff6db44bdbae39b1f58ac5b80769738b2ce8fbb19b3bcb9fbf7cec2a9eab215a7a922025b9110673cb834255240adf10613fd78a8fea47fa7be4fbba9 SHA512 11a010eea3bbbaaf4150a23dadcd10c45737745d51a3341cd7e69cc8537215f313d1ab57059eff265e73e34aeaef435585bb652f5497508dd12b99f67b8580c0
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
index 8b58ae48c5c7..46766b7715e6 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs
 
-DESCRIPTION="An automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
+DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
 HOMEPAGE="http://www.poissonboltzmann.org/"
 SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${PN}-src-${PV}.tar.gz"
 
diff --git a/sci-chemistry/pdbcns/Manifest b/sci-chemistry/pdbcns/Manifest
index 6c49d0676b83..e06fda82a493 100644
--- a/sci-chemistry/pdbcns/Manifest
+++ b/sci-chemistry/pdbcns/Manifest
@@ -1,3 +1,3 @@
 DIST pdbcns.2.0.010504.perl.tgz 6806 SHA256 a2c66e44e036b6a1ff2eff90b59c4adf20edb70d3f704bd7bc7f356040d8f98a SHA512 5174cb51dbe3ead405fa1005d81a7ee063bf4be4268b0e728f1ca0aa3e6cbc005fb0bac3e21e06f872c6f4d42c23f50b6e6130391e3b825260c890070e6f766b WHIRLPOOL b3749fadfe274bcdfca5e18a4f9044ebb8804f2a26e3ebaa22d813c37433c6eefc614a5740744296b1c3b549e3cc39dd8c73772da1a84b010556f8a36a465c39
-EBUILD pdbcns-2.0.010504.ebuild 683 BLAKE2B d82432d6133c174129b0a78c78247979b7b9acb7112a4d50dd4f911541a24bb0c19a21868216f9677dac1d57d21f3f2421881d095a62907f9e59e136d098a5d0 SHA512 e0db8eaa8405403e4b41e1501706a8ccbea5a3b28f6a421ff8daa6e4dadbfc6fc8c86f4646b322a31e4865f1d49f31bd1d387a8c812de51d977fe9a1bf20ef7c
+EBUILD pdbcns-2.0.010504.ebuild 668 BLAKE2B e85485f753dc383e8f477eda221069436dc4049807e25c05d4ceb55405ecacad828296906a0bdb8abc56e89e6f4ec8889194c6d2cd1270dd1c6f1f99320f9b46 SHA512 6426d86b45e7af51fe2a0baad95d378d3ceb16a729ed6469a3b00ecd44aed368b942498fd1c53f0b62060f2170ce6191a9dca04fd23f3de2d58911614cd552c0
 MISC metadata.xml 265 BLAKE2B d5a98b9309829a0486c4b8a4336c2d24a0fe34e926d52afd0cc87e16fcc887ca4c18851e58afb33866823121fa8f221a90e0d726dbd85552a4caf66cf03b7b4a SHA512 470f6c178e88c4e83afa46d5e901a45fc2427a779ae832df7fa2d6e25e9e8b4ce77cd3a8fe191e6242d6df3b673f0de6b4f90f1e147aa8b8dd566f18163cc73a
diff --git a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
index 90903a11b2de..b0b57ed0d51f 100644
--- a/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
+++ b/sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="Convert atom names for common amino acids and nucleic acid bases from PDB format to CNS or back"
+DESCRIPTION="Convert atom names for amino acids/nucleic acid bases between PDB and CNS format"
 HOMEPAGE="http://www.mybiosoftware.com/3d-molecular-model/314/"
 #SRC_URI="http://kinemage.biochem.duke.edu/php/downlode.php?filename=/downloads/software/scripts/${PN}.${PV}.perl.tgz"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${PN}.${PV}.perl.tgz"
diff --git a/sci-chemistry/prekin/Manifest b/sci-chemistry/prekin/Manifest
index 2972ea93c06d..c07f81b89285 100644
--- a/sci-chemistry/prekin/Manifest
+++ b/sci-chemistry/prekin/Manifest
@@ -1,5 +1,5 @@
 AUX 6.51.081122-Makefile.patch 1456 BLAKE2B 769c5237659ddc6abcbeea88d620993b7c52f77ee4b12a8bb200e452b0e5dd8fe41ba2c18056439998ba7d2dea90351e2fc7997cc71e5ec447e128e3c1535b62 SHA512 96b8cda8fc71b2e72c0e8e0a70560a7928456fe81aaa40810a8bcbe77835a7242e8e0d39fac3258e5848a4e4ac14bf9d7dfd4dff8385eb983f359a9f85af9838
 AUX 6.51.081122-overflow.patch 1156 BLAKE2B 86c70ec89564972a451d23a41863969e31b2d0b866c0282728625fe200928aaf87bec7751e8df3fefbce6c2d4f0a21aba13b1d117247ab6b2b14c7d1db2e45b8 SHA512 fe0ff6e3432177653d29ef51ef3a767dc3872fc0a5350c786b3623b6b4d63866fbfbaf4369676feb545766cac5620b209bd87e92c0ecf2280bb39470e7dd5f7b
 DIST prekin.6.51.081122.src.tgz 350756 SHA256 74a771cd8be000df13ac908f23a2e945e8bd3590884c6bc6ccff75804cc0fb7a SHA512 9a41f30a9de955c78ee5685807482b2b073705643cceb53bf57eaf7c0c4753dc88fa8dc19f09d4c8a07124c3c3c73716f29126860ae37ff4dd6fb6178b829d1f WHIRLPOOL 29e5b3a0f060bd46c8e00322a31365526be8e3eec0c4c95b630d3e5d6a22bd3e2538c649774a88c7a3c10841ae34f1b23163ab4b625237b46aabaadec35b0c79
-EBUILD prekin-6.51.081122-r1.ebuild 1082 BLAKE2B 75d8d7ad80ee7610c35db7d475989cf3cc4ff39e6136fb37e24f171e34bcc808b2d9bee0233ec838f87dcdd7d1f0abbc1a61e48572e4638cf9467240d8152643 SHA512 582752645be5f5b5c672b1f69cf3e42415dc0c7bfeefc8f5f7304457b59530cc3ca2eb936416113db203dbf12ec0651db8d96af1acaabd8125d3fa959461f41b
+EBUILD prekin-6.51.081122-r1.ebuild 1052 BLAKE2B 8738d2f9cf0f55938eacc0c9871431913ef36ad819835cee717f9f021d5600bae001e28abf87ebad60f7205817efa561e0f9f7fcba8ba01056f922ff9cf85939 SHA512 5149cbb41bc53b92c2c6c467d30adb271c32cd7233480ed0d6c2bf01f61d7b1f159c44cb656aafe1c6cfffb918aba2d448723a0700725a70e8369fb90691d776
 MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index 7f90ace13b9b..8bea9cc52301 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs eutils multilib
 
 MY_P=${PN}.${PV}
 
-DESCRIPTION="Prepares molecular kinemages (input files for Mage & KiNG) from PDB-format coordinate files"
+DESCRIPTION="Prepares molecular kinemages from PDB-format coordinate files"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
 SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
 
diff --git a/sci-chemistry/propka/Manifest b/sci-chemistry/propka/Manifest
index 2e7d8e028a47..bacb3440467a 100644
--- a/sci-chemistry/propka/Manifest
+++ b/sci-chemistry/propka/Manifest
@@ -1,3 +1,3 @@
 DIST propka-3.1_p140511.tar.xz 151284 SHA256 42b4f6b98bbbefa11fba5e603aa33f1747362746c1170c9958ad408dc34e39af SHA512 c2938af41ed386e267cd045b14e34779889b3c206016d747b68c400f2c8b37bd50cc3b74d055d931476065ac6817a2dd2cb87d68de9911adfff1c8e34a667fc3 WHIRLPOOL 0553ef5f519d41af508885f1900a68627fcf3fb2f901c5d1cef54fe6a5774ef08caf42bf5e80f08cba4c76c9e330be89502e648cf5604aca411c168d4ecda6fa
-EBUILD propka-3.1_p140511.ebuild 818 BLAKE2B 293d92f717efce535e7f224f3a637d6a3efc67b45a59518ca4ced1630f0a245d296b3fc731f1782ce540fcf547bc42f8b253d8169dd47c9db0d29e68de00ec0d SHA512 11067e38fe55d39e0379f739db6385d28e6bdb45545d61607c3e2f4d5780235eb0959c40d5c2f4ef0e2a7965c169c720cb27be9ef445f272953d308479a2f430
+EBUILD propka-3.1_p140511.ebuild 809 BLAKE2B a16f0aecb2e419afff73e4162c82ad0ece517e767cc26d40ef9c2466be00e29bf2a62f0405c6a3f632415e2436c615fb7a625d9a7cf3b245655c640d0a892f35 SHA512 594f0b00d9ef1782e881e522b6ffdaf5941adde282901a616d9ce548a322812079914fe9b830a5eb498c74f878a4917bc0b1c8af9eccd77087f3ac3d62e72640
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/propka/propka-3.1_p140511.ebuild b/sci-chemistry/propka/propka-3.1_p140511.ebuild
index 2d34b8da5d5f..4b90e9aeab97 100644
--- a/sci-chemistry/propka/propka-3.1_p140511.ebuild
+++ b/sci-chemistry/propka/propka-3.1_p140511.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="Prediction of the pKa values of ionizable groups in proteins and protein-ligand complexes"
+DESCRIPTION="pKa-value prediction of ionizable groups in protein and protein-ligand complexes"
 HOMEPAGE="http://propka.ki.ku.dk/"
 SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 
diff --git a/sci-chemistry/shelx/Manifest b/sci-chemistry/shelx/Manifest
index 7ce41329f3fe..6c981e7abb5f 100644
--- a/sci-chemistry/shelx/Manifest
+++ b/sci-chemistry/shelx/Manifest
@@ -16,5 +16,5 @@ DIST shelxt_amd64.bz2 8862210 SHA256 519c695b8f6c0425f2635dc021be8138ef029761a43
 DIST shelxt_x86.bz2 4441488 SHA256 ca64d86718d306d8d5269f0d7ca92fc2921f1a199afa1bc181b5f6cc339a012c SHA512 83027d24d58863030a284e5e573df27db760ce61f7c8d7da5741471bd814256ae5ade1316aa3e262a54c4c4fb6ad231dacfcef043c3279d381d2969e0b73dd14 WHIRLPOOL ec91f0e6d192507854cbcc2baa751c17185df70f2220eab8f487a1db082bc055aefe2b5f437e144fbbf60c01f1d735057c07ff2f71ab77c88c13a1a19ffe7a65
 DIST shredcif_amd64.bz2 1371002 SHA256 eddf6237b70114bab99845c228d5ba6240a2a9e019bf59678f2222e2ddc52cfe SHA512 5846f7a14936ae4c710ead752a83dd8d73bbcd6037c38f2c566156f87678a84c1db3fd5d0a6e3c6dfb04a2ed7c96c8497c36faaf2bf2ca99ace74f98152ba3be WHIRLPOOL 11b82847cd4f3529c7708de7d0ae7da4e741a58da58ac01954e7136ca2f02c599a81485c70ff36916cdce97e86ab67efe61ec544231db9d7ad903edfd68e232b
 DIST shredcif_x86.bz2 461442 SHA256 aa06e0b3f2b7face7f486029d4c83e9fd591c46b2a41db6ce8e3014f6a713d78 SHA512 8097b6285d3e9269989663e52a4d903b279f9cdd0a5650c91d605dd324c62361de619c0873968a3178d3c125f59a9b448465a09542e2582779fbb8cca1f9ebf7 WHIRLPOOL 37f9410d1fcf2881b3e83b752d5170859ebab2063da8124715d5f627a83b9ef2ba4694a2a77a213e8c1b92d474304a7aea83b1f03111fd2abbb3fcd13d054052
-EBUILD shelx-20141228.ebuild 1106 BLAKE2B b29975eadbce80fd40a9d5d4f35108885951a41f328f016f830472ba93fb48a5d54c39eac8af9ce8332a85e93f614b550e42bf0d77f3b15b85cb01f4196cef1d SHA512 b50a1b7db705633d9eb6654fd8485164c4f16dbe4f632ce834018b9dee9e605fb63c8fa04b4bb8f6a8689b73ab2481df8b0a9ba8ed858b69094f39c653775419
+EBUILD shelx-20141228.ebuild 1093 BLAKE2B fef0b656bffa33a4be13e34d101b1e55f4eec5d6ae790971a6919e0a753f3c28783e0b6480641d9815204fd84d1b4d2495dd0538746a021189dec6d4503918e3 SHA512 4e35de5c607eebb0484e8144cb34e03040efe733e7fbeace80d99efca1aecca1a13a1bfe1a01c6ad20d7f7c0e14a318603dc839ef5172752920c759325119919
 MISC metadata.xml 271 BLAKE2B a446884cbe7a6789e0bcd82759f57bf1ab7b29c5ab714057ffa821c90f799d1fa9f9310c187ee4c3a8ae2476f6ea9d15f368045779f1581e68d02802c61c884c SHA512 3e6e6047a29e07123b81279cae1de17bc4bd4c3d7d8a8d26560114a18185f473d038fc220fa81c7213fa203ce197bad8b1c272d9b7e41cd770a953fa6308ff92
diff --git a/sci-chemistry/shelx/shelx-20141228.ebuild b/sci-chemistry/shelx/shelx-20141228.ebuild
index 541cbfb83802..d2b279bf8d1e 100644
--- a/sci-chemistry/shelx/shelx-20141228.ebuild
+++ b/sci-chemistry/shelx/shelx-20141228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="Programs for crystal structure determination from single-crystal diffraction data"
+DESCRIPTION="Crystal structure determination from single-crystal diffraction data"
 HOMEPAGE="http://shelx.uni-ac.gwdg.de/SHELX/"
 SRC_URI="
 	amd64? (
diff --git a/sci-chemistry/suitename/Manifest b/sci-chemistry/suitename/Manifest
index dd7a37c2b5c0..6c9b760d088d 100644
--- a/sci-chemistry/suitename/Manifest
+++ b/sci-chemistry/suitename/Manifest
@@ -1,3 +1,3 @@
 DIST suitename.0.3.070628.src.tgz 29914 SHA256 5c2a709aa2d815b259475344aa2b982c157868eb9a7e5d6407b8f525f7e28c4c SHA512 27811e2511da760c3c35d0a44aa798a35610a0e80a72d8aa58b78cb780156508f96e1890f558b1aa43bc3469d433352b29e53dca79f3a876ae2b7073f8e73088 WHIRLPOOL f4d84180df12062ebfe402231276808bd28280c44c83559330071225aaa8f29c70cd7edf24c7657bdc53d6359df6dc61b7a601f01cb5e164eca3b017d386c6ec
-EBUILD suitename-0.3.070628.ebuild 760 BLAKE2B 85fe6f6f8b784c55dce02232e1036a4c3cce551fbb1ad2aefebf39513e2e76b960d99a821d9b5cb448dac3ad5c360e24b020b21ef34ff3cf29f07f70e58f1f5a SHA512 59764e2a91931807a5a0f3f18de7b21064f6bb31311350d921a59d2d602b5433fc849ff16117504ababefc70ca007b302a67fb68f80ea38d01cd695fdf48cd4c
+EBUILD suitename-0.3.070628.ebuild 726 BLAKE2B ab5cc3123c164466949a49ae93935e9909329edc592eec3ee824dea0cd1089f86662574cbe303f19ee685a4db5737c57f88b8f354d84b6dda26a630d98289097 SHA512 508b64119cf3c2ae72e5e321d7364401c33939490595bb2febae866df6ce2a00d506d78425d4de644fbe49191dc9163283e60835dd1ccb3bc428c9b9d1f4f079
 MISC metadata.xml 1118 BLAKE2B f10c14e983382b489ea47eec41a17e39df81660cc56ea001ddfc9b6c67f8e96f65f52cb5e8c24d5d5211dfbf5fa17293f3dac1d2924a77e3b517d1b3796f7892 SHA512 7b2b6baa9bbc3e4ff3e2b2c0ba15dce0af04b06133c96872bbbb3626566a025d1b7d5472fc159e879e7be0cf50b5c27ebbcbd8def5cb182fc3654b893d88f2f2
diff --git a/sci-chemistry/suitename/suitename-0.3.070628.ebuild b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
index e0306fac8f29..8441770df5ca 100644
--- a/sci-chemistry/suitename/suitename-0.3.070628.ebuild
+++ b/sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 MY_P="${PN}.${PV}"
 
-DESCRIPTION="The ROC RNA Ontology Consortium consensus RNA backbone nomenclature and conformer-list development"
+DESCRIPTION="The ROC RNA Ontology nomenclature and conformer-list development"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/suitename.php"
 SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
 
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 1806f37405ed..d06604871082 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/electric/Manifest b/sci-electronics/electric/Manifest
index f2d77af5dd81..e1a8d71b4456 100644
--- a/sci-electronics/electric/Manifest
+++ b/sci-electronics/electric/Manifest
@@ -2,8 +2,8 @@ DIST electricBinary-8.09.jar 11102701 SHA256 d214868e8df9f4d50b09a23f6ac86b3e8cf
 DIST electricBinary-8.11.jar 12144732 SHA256 203dac811566505cc222d3bd4926d6c6481d4a66af3093ad7e2ca8b16e65fb81 SHA512 960355b580f9137c6fe9e5ba00c31ab1f61eacbf5689a51f88f12a48fb0742e702258bf6de4a6349c938f28d16294948cecd0eae261f82898e859f06361669e2 WHIRLPOOL 1e63a7b2ec8934e151aa698a1f3c397adad23dfe45b8958b89370b32bad9eff3487ca38991592e6fcc76ca1466ddfc72c3f12f5f7c31eda12d7bd0e2e125eab2
 DIST electricBinary-9.02.jar 23429359 SHA256 107ee1ffc1d5e0236852c728265f434043036802703f05c22789c76931b95f97 SHA512 3c4eab21865bfabb744ab227fb0344552fae7291fbf3c043903ee919fd80238ec9674e3535ac80caab9bf3fa962ec45ca21378629d5d68d470c53849e8ded471 WHIRLPOOL e06d7dd647a98ca5eb1d54bff7e153999c68096cbf7939523520cb794479556687c539ca9509ab903772b5551d6a9a7cb24b1961ca894666f4b57d6d98e12dd4
 DIST electricBinary-9.03.jar 23591444 SHA256 ccd4ea6b9b2d11870e181c951f5393e9c3eb5d881dde5588bb090610d99bcff6 SHA512 e4430c87e1c0d335341057950b887988f46bd222ab6c2d989312036592f16db0b51169f3affc01fe0dbd8077674ed934d4896de46a0f9ee00e71453b2a6b18f2 WHIRLPOOL 9d886fa32533e3ebb2504906ffdfdc9610c1bae77db66ec2a0279ebaebbb94e04506e229d77c4d22d918059781be17c1ae215415b47e0874d0116ea8138e1eb7
-EBUILD electric-8.09.ebuild 774 BLAKE2B 22f1477a3b946461692eb4b644cf262203510a8f1a2eb8eb03ad600db39c9bef41ee9b4d34df5ce42bfdc2c49257e60f831e3088a88292472c24be5508aa5bb3 SHA512 be28a819e1140d61b2712499db5777200eed93cede8140f7b2b537f27a2ab3535803810c471e11808fd43578f7499d7eb76adee405130daded15ddbfde62f0c9
-EBUILD electric-8.11.ebuild 776 BLAKE2B 23a85d020c8f73f2a6b9af93ff291c6834487a50f7ab981f5d0c0ab4bbce57168dd73b3f7b56d7b52b1ddbe3f2d53602825a26aa91c191666196cc2844640176 SHA512 ee50c2b98432e9329f0511e425786cac54ec3228a93e4f8498ac49a28854404a8b37675097069dc2b303b0c5598d5c8ab27e44ee58076ce70cc2153ee2304b68
-EBUILD electric-9.02.ebuild 774 BLAKE2B 22f1477a3b946461692eb4b644cf262203510a8f1a2eb8eb03ad600db39c9bef41ee9b4d34df5ce42bfdc2c49257e60f831e3088a88292472c24be5508aa5bb3 SHA512 be28a819e1140d61b2712499db5777200eed93cede8140f7b2b537f27a2ab3535803810c471e11808fd43578f7499d7eb76adee405130daded15ddbfde62f0c9
-EBUILD electric-9.03.ebuild 776 BLAKE2B 23a85d020c8f73f2a6b9af93ff291c6834487a50f7ab981f5d0c0ab4bbce57168dd73b3f7b56d7b52b1ddbe3f2d53602825a26aa91c191666196cc2844640176 SHA512 ee50c2b98432e9329f0511e425786cac54ec3228a93e4f8498ac49a28854404a8b37675097069dc2b303b0c5598d5c8ab27e44ee58076ce70cc2153ee2304b68
+EBUILD electric-8.09.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
+EBUILD electric-8.11.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
+EBUILD electric-9.02.ebuild 756 BLAKE2B 2e1a536c5a64d58903572e058bc3e829191f3cb17373a9b95649ef68202f91d5eafd12b92277dcaa70ae9dec3b70118552d39c65738276243ef91e97cb6a0482 SHA512 08f0faad39992c4397fdc7c236d27f250e07095364f044a23beabc902c889329bcf296f8b2d307e33f41be4b93ab2ad97941644f1bfae2f8ddb77707cdda3c5b
+EBUILD electric-9.03.ebuild 758 BLAKE2B e8cef88cec59ae547ee1f00e943c6df25aa82ad4da8c280bab61da4ebf6c623e11a754b7aadddef6b90e93df5f7b72114d05eaa92bfaf83d3e679431ca4c66ed SHA512 b4a6a5f114d9b37c5f4189b0910330f765e8b7029a14e8d85ff3faccc6ef6357a82e5d29e3736a7ba0308981e84909f775dcaf0f508fd1a074e263073b4c40dd
 MISC metadata.xml 639 BLAKE2B df8422e39990021ac0e976721795e5bea9aaebeaf2e064dc930d57809a69388fdcf69418d1057e98f91ec8b1dde1bd6b7ffbe317d92bfe9bbed61f1881b2f5ed SHA512 856409ad27b7e3cc812c369e0ca8d362d8d71d9ba66ac189b68680a62da1501e019d7344a52a4f8c48b4cb6c5e8dec399cf1eca47751131336cd9355a9846973
diff --git a/sci-electronics/electric/electric-8.09.ebuild b/sci-electronics/electric/electric-8.09.ebuild
index 7ae942a08d6d..5c969c996b04 100644
--- a/sci-electronics/electric/electric-8.09.ebuild
+++ b/sci-electronics/electric/electric-8.09.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-8.11.ebuild b/sci-electronics/electric/electric-8.11.ebuild
index 98a75e61208e..e7c190691c95 100644
--- a/sci-electronics/electric/electric-8.11.ebuild
+++ b/sci-electronics/electric/electric-8.11.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-9.02.ebuild b/sci-electronics/electric/electric-9.02.ebuild
index 7ae942a08d6d..5c969c996b04 100644
--- a/sci-electronics/electric/electric-9.02.ebuild
+++ b/sci-electronics/electric/electric-9.02.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/electric/electric-9.03.ebuild b/sci-electronics/electric/electric-9.03.ebuild
index 98a75e61208e..e7c190691c95 100644
--- a/sci-electronics/electric/electric-9.03.ebuild
+++ b/sci-electronics/electric/electric-9.03.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="Complete Electronic Design Automation (EDA) system that can handle many forms of circuit design"
+DESCRIPTION="Complete Electronic Design Automation system for many forms of circuit design"
 HOMEPAGE="https://www.gnu.org/software/electric/electric.html"
 SRC_URI="mirror://gnu/electric/${PN}Binary-${PV}.jar"
 
diff --git a/sci-electronics/oregano/Manifest b/sci-electronics/oregano/Manifest
index ef001f1d2ef2..d2ca2463978f 100644
--- a/sci-electronics/oregano/Manifest
+++ b/sci-electronics/oregano/Manifest
@@ -7,6 +7,6 @@ AUX oregano-0.82-format-security.patch 1002 BLAKE2B 2955cf13436139f0d7f81c0e40a9
 AUX oregano-0.82-remove.unneeded.docs.patch 209 BLAKE2B 4ae747d8c0e17434f7dd883f8647ba61eb26b97c3a5e5da9cfe72d4cd17afe76d8fd6492f85cfee8efa771fb238eed68e2000ac0004f6becfba00df5516cecc8 SHA512 ba8526dd5e626af65c16bcf0ac342ddcfee309e2580242f766129448d376e0969a2ddf0c960c626bd214dd36881bfe305993d3abc0c42009fcfd9e4a5e1af319
 DIST oregano-0.82.tar.gz 1398390 SHA256 b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d SHA512 9c03f079e81f8de7d9e8880a890059bd8034e82bf47566ba3905943ccedc7a1642517fa2f6fcb2a2d10228c0bf79da055c1ed9bf3e07e505819641cd7cbf168c WHIRLPOOL 668ed4f056fc0d39a789bfcb67d80375738f54951127cd3007b3b8261a370a41b758728d97d40b4fb773f131636e20f0e721ddb6a0f3e0d640e6d344ef102010
 DIST oregano_0.69.1.orig.tar.gz 673785 SHA256 ec96f6d113c642aa423d4abf9d667802bc3754eda8a9f4e287b8b9cefbb4b589 SHA512 4dc12f90c70ef5ff5011cfc29f3c53e7ea4c77c3b38815919ebdf90fbcf3b157d4dc7327d62c190945f7c191f4584931a02dda50ae966aa59d6da5098e8ca5e2 WHIRLPOOL c1c78fdf1f5a26417d0272157301952f944c7552bc72fb2c7982ef454b4f4096f432950fc63fb78baeb0c686d0c3edbd036dc0ce1bc93c4f9af3c09f5c2889e1
-EBUILD oregano-0.69.1-r1.ebuild 1572 BLAKE2B b550bd1a1ce933950feffb47d8bbded61e8dd7c48b9ba75dcc567398790c0bad5dfbf870d80880ed71c74cbe1964b1fe3e968aec2a02fe2c8f6c47739593ab41 SHA512 52b811e313a2f77fbfca85feb338e9a9efeeb300104a3fc8eae3303deb79250bcf63eda015b3abe0ccacb553fc10a767be94d9706aeb30e3f8e4c73701e8b4ba
-EBUILD oregano-0.82.ebuild 1812 BLAKE2B b99fb3f8f98689c153784359283bb3a80076fd1d40045a827e3a884c130f0630a356e8268cc54af09cb029832d4db23f6c9de061290bd2219651ec28cb108bcf SHA512 a260c897e49328ad5b73a4b07028ebd0ea1987260f7bf7206d7c6783a4e8182b4e1c2fd44cf6b6a8288747c4e51a4ae0545d8d55d9a07ab3dbe926da0a793c04
+EBUILD oregano-0.69.1-r1.ebuild 1564 BLAKE2B 1a032a75826e29f08a13a405b924647ec62a8ebf1958a3ae8b1fa3767e6e8553493119f1f432a53422e2b938e62f578e59d411ecb85bd4c787095c7d67b1fe24 SHA512 e4fbdc807becdd22cc512e93d04c3998a55794f6fc6f973f57b9817545b7626b65abd8685c9102488ba91c129850c596b70b32b80ec2d05c9ee65cb87732d239
+EBUILD oregano-0.82.ebuild 1804 BLAKE2B 0aa8047ff58ec0cb9e47c3408da94322708d6952b1ffa113afde7d8575ecf61a3b0cace905c7329ca1b0f5362a3279deb1aa7c0cebce36a326a99817afbfdc17 SHA512 fd882fc813d4cff662784c7bbfdafd5bbbc8ca502d24f764a05cbc80f990f081fb00e774bf13beff589d937a72f735784000a795529329c9feae9012a097188c
 MISC metadata.xml 580 BLAKE2B 45417e1665e49b1d5cd4692b386f8376ee9c5fa05d34cc899fc5be389428a020f8c8e58e351658171f24f46374f8a6d57083acf3124d6d2f2ffe704489aa574f SHA512 fa90d21f4537f76411067d527239f359eecc359dd40e816cc8fa9c12caac495b7ac49933bd08d42389da6508bd606ffe3d3cd335681cd0330d2e1a742aead99b
diff --git a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
index 3c0355c51a5c..bd9baed4542d 100644
--- a/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
+++ b/sci-electronics/oregano/oregano-0.69.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit eutils fdo-mime flag-o-matic scons-utils
 
-DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits"
+DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 HOMEPAGE="http://oregano.gforge.lug.fi.uba.ar/" # broken
 SLOT="0"
diff --git a/sci-electronics/oregano/oregano-0.82.ebuild b/sci-electronics/oregano/oregano-0.82.ebuild
index a1afa0de72a1..ba7caa09a557 100644
--- a/sci-electronics/oregano/oregano-0.82.ebuild
+++ b/sci-electronics/oregano/oregano-0.82.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit autotools eutils fdo-mime vcs-snapshot gnome2-utils
 
-DESCRIPTION="Oregano is an application for schematic capture and simulation of electrical circuits"
+DESCRIPTION="Application for the schematic capturing and simulation of electrical circuits"
 HOMEPAGE="https://github.com/marc-lorber/oregano"
 SRC_URI="https://github.com/marc-lorber/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 9fe529e8abb6..ba9ffe7ba07d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/bmrblib/Manifest b/sci-libs/bmrblib/Manifest
index dbb0afd7a701..84cd0a0bfdce 100644
--- a/sci-libs/bmrblib/Manifest
+++ b/sci-libs/bmrblib/Manifest
@@ -1,3 +1,3 @@
 DIST bmrblib-1.0.3.tar.bz2 51246 SHA256 583e8d8f4ea2aaffec5eb30edfb4a840f1222512ad4f17c2d0d2c885a5afe3f6 SHA512 b03ad9e4ca035439165ebd1b7ba93ede427b2a233a4179be4e8089db988f1dcdce68b1e97348fe22fe7f2c3827ed003b654e0674a4d16a9e32a8a7c255c4b248 WHIRLPOOL 65b3a62142092af882be8d45fa84dd5b80e983c6bfb36d98b5ab444d6b0e4b0523ca64977a6643f27be9d64448a0c7e0ee2021bcbc306cbaa2101dcc3a1f6e1a
-EBUILD bmrblib-1.0.3.ebuild 465 BLAKE2B ab980f07891c0a150d3e47f83dfc1de5633228fa525c7cb97e69199865eda849abefdf4bb3ec119927b99476ca467776e06eff3bd764c9ad68b2c7826fa109b9 SHA512 151733614dc3c6b770f97fba0350bef1f711e68292f72978da780f0b6c31cc2b176a09174ba080b84eb1f0e7de8abd728d33040d65d17b0ff5b0e5da23f017b1
+EBUILD bmrblib-1.0.3.ebuild 437 BLAKE2B f464aac3db2fb667ac9ff2634123df2330bd290598b174b0d4edb56c5cfd0c2697a3a50e55971de3ae80c4d9d4dea7bb33cce141f6ebfced1ee9ab2e9ad966fb SHA512 c060d0970cae0d40c91fba56bdd3de8a0586e900aa8e182c4335bad62a9b9677843cc0f7ddcf33a84c551ec4762a4aa800a5f85bae0dcb3f82458d14f8fe5b71
 MISC metadata.xml 697 BLAKE2B 6448efc90859f836649dc91366bc8662fbccac80ee2079880078238b2c9bd7897cb3337aecc727f2dc2da2f8916e766c25bcd5703d1b0eb4b263c3e3481fffb7 SHA512 c09f4efba0b36032d60b363ff7f18a6b477f6a321c7d8069ebcc4bcd0deee1448c1230e5651371a5748cdd66c9032e8ff7c480dfa3af7a712503f3589d282f28
diff --git a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
index 0b1e918d5776..dabaa86922d3 100644
--- a/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
+++ b/sci-libs/bmrblib/bmrblib-1.0.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1
 
-DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format (http://www.bmrb.wisc.edu/)"
+DESCRIPTION="API abstracting the BioMagResBank (BMRB) NMR-STAR format"
 HOMEPAGE="http://gna.org/projects/bmrblib/"
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
 
diff --git a/sci-libs/inchi/Manifest b/sci-libs/inchi/Manifest
index 9c19ce0e6245..a7784870e6da 100644
--- a/sci-libs/inchi/Manifest
+++ b/sci-libs/inchi/Manifest
@@ -2,5 +2,5 @@ AUX inchi-1.03-shared.patch 804 BLAKE2B f76a320c3bdd88075f5717e2bcfa717a7acd2b17
 AUX inchi-1.04-static.patch 570 BLAKE2B 33ef224a8fe2304143b51fc57188b8e30b08797a9495c665d76f9cc4436ef8ee6804b50cda1bcf2b11b56acf829599a5b0d8318e75e434a90eedddcbc3e5ebb0 SHA512 0bc4aaf5ff4565517dbef481ca89069f3e91bd8d2b02f8e2591519183feca8725004a51375bec4560002d35b030483a21d9e36a1eb8202e3692186e23dcb7078
 DIST inchi-1.04-doc.zip 2128303 SHA256 abede36063e838614aa6ade7f20f386f557a78aefb041e1ba0b736088a6a79bc SHA512 930fe10ac2bae11074b7e47446b5af9c01e2aa55f891d04912c71c76e214871c78cc22b3dafea99b57eede5080ac0cfaa6b6d35a73242c8549bea8ffa86e7df7 WHIRLPOOL 5cb5884dbfc9f2e530deb8be0e35643b0a6af70a5b4e069cd610407fac067261a3282ad9db22651fc2efc313ade78930de10ff165dd709a83880815b89e4a4fd
 DIST inchi-1.04.zip 2701930 SHA256 c187573c0f6a1fcd555393315383bd1f69563ee47bd43c898f17c473b7bb690a SHA512 c5a1c2f08d472fcde603acbd898a9a8880407474869eadf0089444503693ae89ff805c579161cb3ee9d7f18e891289a21c4b8a65cc7ece69ee730f7f4e283be4 WHIRLPOOL 89a7ac2f80a9a87a663934bd0f24af6aed77f51115bf0b4858f66c135f932b67dff7bbffa16999ab79f7ca1358ef716fa5f11cb8756011f7622f6440470c59e4
-EBUILD inchi-1.04.ebuild 1866 BLAKE2B d415cfd29f0bc8537d46f14a194c0bc76ee5605196d83a60914b3c91e67a9a69e3d7dee920560bf6ca32189db4d0d763918086b467be1782386e92391004b2fb SHA512 f1a9bff0cfe54e26d0c0368c539cc66cf0d405c852e7959f07ef9795082b74e1f7866c7c094edd8e83557af293b488f20c8e0adfaa083e5ba176b6aae158f7be
+EBUILD inchi-1.04.ebuild 1864 BLAKE2B 757974d84c13c68f45a9a0dcd95ebdd17123b0c9f37b72c6248bdd4388b3a38a23edb73a0d46ef148f40466e9c146051645f220c709c869268b9aa3ef08da15b SHA512 88f724764edcb050b0eb5f4464a3d64f3580cdc247f773bd912e0d89e854baaab72b9d575759f7f57bedb728729399b52bbf645d7db69c752d9a2ae171425327
 MISC metadata.xml 380 BLAKE2B 74923bd354b84bf3850075c912fac01074a40eaf2a8f0c52552b09b906d6ec6a3f6e341657757cac447cd64b7a6592470f8d6f68a6d2106e2f51718700defec9 SHA512 04f24f7bca8346ab9b06e3e7edd77e45a38bf48bb2a4592234999cf3f6fccd74851508b892e5d6b33ae9cac00ec7725985924e91c5a6fae3a032e551acfb044e
diff --git a/sci-libs/inchi/inchi-1.04.ebuild b/sci-libs/inchi/inchi-1.04.ebuild
index 84ae21c021e9..984b312edafc 100644
--- a/sci-libs/inchi/inchi-1.04.ebuild
+++ b/sci-libs/inchi/inchi-1.04.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A program and library for generating standard and non-standard InChI and InChIKeys"
+DESCRIPTION="Program and library for generating standard and non-standard InChI and InChIKeys"
 HOMEPAGE="http://www.iupac.org/inchi/"
 SRC_URI="
 	http://www.inchi-trust.org/sites/default/files/inchi-${PV}/INCHI-1-API.ZIP -> ${P}.zip
diff --git a/sci-libs/ipp/Manifest b/sci-libs/ipp/Manifest
index b9f10189579b..b31ccf27b5ce 100644
--- a/sci-libs/ipp/Manifest
+++ b/sci-libs/ipp/Manifest
@@ -14,12 +14,12 @@ DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 SHA256 31383f357b9b7
 DIST parallel_studio_xe_2015.tgz 3819862086 SHA256 31abe447b1db457b38547dfbf0fd7e434cb45d5734892ec3ef95ef5f4d2f8ae2 SHA512 889844fe067d1b1095283686f1b1657aab2bbda2a7e9014aec88a0ef1af8c8a0e1da3a4414600d4b450b2a1b4b13496b5165e495ccdf3187c27f58eaff07b13b WHIRLPOOL c2be966c8910d8995b845e25d60ceb700bfe9bc78daf60e97fd016de6e1abc60bb0f4fe33e2cd7c8960ebbf1540d418524414a351ed9256a80cdee4e29166961
 DIST parallel_studio_xe_2015_update2.tgz 4145283363 SHA256 8cbde4d4fb3bbfcc5096d5d924953121ca84e9a9bee7b00dfd07c029c1a89943 SHA512 1166eaa41c881059673dbf51194cf800fbc94a1080fc9eebbacc20cd762c3b2e92f83191cb1cdacc50da0c8522524b7132d269fc2a91615ba4fbda5c63cb7a47 WHIRLPOOL 95e93fc964f0ddbd81e87d3c8083adea3f8ab82fc0668dc00b10154ba8911bd50d07be9d2130a1b27c7ea66e5208e172055df4fee69f336ae777d629ca7874d4
 DIST parallel_studio_xe_2015_update3.tgz 4156836825 SHA256 ab7169989c87bbb0fe66221cb7eb3a26b17c8b9ceff38f1926e5607834306896 SHA512 eccc2bfe85ccd039a2ec9e334d370e49d43baa0522d095c087a5982aa08bddb4c97bfc3125bd09f5cd57d3ed252c598012e1f2670b8373a1b3bb455825d18f96 WHIRLPOOL d1fd8d1e46ce35150357a9452f04529d8a1f7e915e50a5d714895184aa37fb61186a5455e89b4750f444f0f6da94563e493d0821c661378551c3739f8d27d7b9
-EBUILD ipp-7.1.0.079.ebuild 573 BLAKE2B c99d413b8e6c475630ebf90d8178640dd35f4e3ffd572b1ed57bda78b286d710bdb5bccfbe28f5975bb7c17028d6a278ce6bd618cdd8743b4234e73ec5ccb905 SHA512 e12a4cafba8171b7f609e5a92e70bae3b8d33aaab381d57e5b9a0d215785523f06309efe7a0b83aada8973d00227c93348197e32bf8eb0f047e436aa5f401cc4
-EBUILD ipp-7.1.1.117.ebuild 581 BLAKE2B abc275d5bdd5431a48b5cc3a187b5ae8cf05e87be5e2cfcb9aa42f2b9828b40edbef464e1c574a991f3e5cef79ca4bbbc64613321b22ba0f2edbabd1972413d0 SHA512 d6abd8d5849213366006e09280a86d342a9a00627437bcc34cddc8de3ff9f82a87534217d389a90467e99ac344883fecc73fef642ac825bd12f7cd0e1b5f5652
-EBUILD ipp-7.1.1.146.ebuild 608 BLAKE2B 75e4d5ec58b2d915d7fa641e841d1186b6e10d48e03a9d0bdf89275fbf5fd71231a5970db1cd1ab848c6f82360ee70a7d7c6cb402cde4d2b01d218228435b768 SHA512 639a73e7db3fd410c9a98f523840fc80e166ab4cefdea3c0ce1c2896037bd42127badbf5c2a3b56d2113357324913a514a12afafd45e10f21c0e2d71a0019403
-EBUILD ipp-7.1.1.192.ebuild 608 BLAKE2B 6303b0d4235c1d26ee6a65840c58271b1088d884d0929c4c3d2071071908c7ff0870a4829099b9882f8f20352754bc46366e11201cd2e91cebad83a25a4536ca SHA512 ebb7467a773b7bda8e0660fe5a330cd9e6d625a8b10d940afd63ec095632a259e2496b0ba84b9636bd00bd47ce2fafa1ddd29777ea4896ebf012a094ce5c1d2b
-EBUILD ipp-8.0.1.080.ebuild 703 BLAKE2B 60dd5356c327aa8055768258bb1eb54c091cb8fbaafc501680aa5c5545499dbc844d7613698396c2f0763fd07beff65e4e2196547adb8bc7efea9c0e5a10f016 SHA512 9e01c773b07bbd1417de4d3c2171c510573138f7264b97bb0549bfad9aefcc08834c6bda1ad57df1195b64cd0879cb92d82aa0b495d34baf43dc843bc6a9852b
-EBUILD ipp-8.2.0.090.ebuild 714 BLAKE2B 942f3de062729e016acf8412e9ba4bcd2131d70bd9a97b2a244ba158186110589b8b0d8c664e241260f98da867fdca163075246ca24c8b880ec39060e964dd38 SHA512 61275ebcbdb599c75dc058b05d5f3d44aa196b71c0f7d3eb2f5e1ac005a1c9c18632701888c7013216f56e79fc18fd4b76d652b160d05c20d54ffe35ad7be33e
-EBUILD ipp-8.2.1.164.ebuild 722 BLAKE2B 8c7259477b361616ba658ef9561568ecd192e66b4ea5fea78c693fd26e2adb451e3bbd99b0b0357db4e6dab7fb07992575c13ca047a209c6dd5fad1761a30464 SHA512 2b6796daee3cd07115db233e6f9cb7ddc7315d2e98fd0f39415128182f7c87e0067960a3a401ddf26a25743ca0da3993d2539eee44d83e0a69e3f7d837d60506
-EBUILD ipp-8.2.2.187.ebuild 722 BLAKE2B c3840e8081ed5ff9af1980861b69e6854e4296f027f53f2dad53fa18e45aea4ae8549235a9b576d5421d659527788b45a1f3da96d4b4e67fec1a4b3aff9492d5 SHA512 43349b82a55d5b590aa9eb018b139a163e6c0ed05d9325ec5c2c3d1cf3c96748234e034c8734135b6225f8efc9263b0b218be0f6e195f241c62af9b1eeb29972
+EBUILD ipp-7.1.0.079.ebuild 566 BLAKE2B 87ac618057b3d175d42bd7f1bede407ff7f9f7b479dca1267bc20b1728744ecb3b93c3120919fd7554cffd53fab5b56e954eff8e7a417418e439172d3a7e1b29 SHA512 4376b6042f6024646f527452fdb063d64c910d119b855b4303eb445f33d5904164801487e1e5ce471e2343ddec1a7dab2a81710a3917c3614253cf9cd06e0734
+EBUILD ipp-7.1.1.117.ebuild 574 BLAKE2B 75b0475265b288e68f36a3872a6687df4e256c9f0daa40d454148fc2d60c02e7ab449c11642fc78b7c03ec9995d49cc83d920ce80ea5ed8ddf7afcfba3873d21 SHA512 ec50c33279245b48ee07abec500383320746961aeabd023b3242004a37864706c88e1f4ccfc59b3c3751778dda8630a64a3732b37dce3c6528e1648830c6f200
+EBUILD ipp-7.1.1.146.ebuild 601 BLAKE2B 9b2f2eb4e9a0f0ba17c7303a973f169e2d729b2f94b0fa32da8a0129ce4806fb1c78542d5b93353bf527a5bca2ee812e86ec2a2dcad2ae951b8058c300489a2e SHA512 b038f028384545266035f1fe4e4c7e2d62b001bd36904d5f85798978e553323f0e7fb4cc3ba372abde70a0f23ddc683f83c896aaccba78dd889361b50cd95bbf
+EBUILD ipp-7.1.1.192.ebuild 601 BLAKE2B 14f89aec00d560316b3214f56c86edac5e4a5ba9676698ac3db7ab4eb77c5c528a2c0d1240e3596a58a04eb8e47cd2db61386a095ac9c97d61633755a453b5ee SHA512 2a2744211c75342307560048167226562431ab9b03521891ae68a5cee4eae320b64ce2dcb44a68c1a4ef073b0bfc3b89a68b76f684d6775400397cd081779815
+EBUILD ipp-8.0.1.080.ebuild 696 BLAKE2B 825ace1cb86281b7127b0d03994f95c85d24f439a75ed204eac921b73ed06a435b88f28f52d73cb3c2a87c55369e566e1ddb9f4fbcd1c4abc000f403d46e2bdc SHA512 d68bfb472e48f3c8a96fe02db84d96dd8c691226d7e75572f5f04e4dd7f7f1f3857ec1a65fe56694ad609adf3e99fa0006ffcae21c3e52f0cc25b0a210090b0d
+EBUILD ipp-8.2.0.090.ebuild 707 BLAKE2B 803ade72a3ee912827eaca3716f1150ff92be9032989f2040d2eaba6717d61a0320f98323239c495cd024519258e9d4a008f56da7a28dff9012203ac1ba4eff5 SHA512 1e1481e851c628149ac35c045e725fe98aaf8d1308576543ab326d0ffdad3cd22f3e058a1e5f27c9523bc7cb191276214b71af86e28734dbe9f78192acc986cb
+EBUILD ipp-8.2.1.164.ebuild 715 BLAKE2B 835af417883277c401336532c6cdd958d22b03d4c32b9c264859f0ab7c990dd6643f66513ae52e2fa09cea977da853553f9cde6cb982c0737ce12f86abcf0a46 SHA512 1e7bc3186ca0554a58d5c051d0d3165258cdbd4e4d0bb4d72410d30e89ade3c6e78cb55f2befb42d944b8c6c2ba7c2f3b53418372bfb3968086f4fb8184089a0
+EBUILD ipp-8.2.2.187.ebuild 715 BLAKE2B 0b65f922d644e6277160880b2301a71e7fb0e2d5129e87b88783c5baa248f5504ce9ead0ea16495c2d03d5efa95b90c16e087190029182431a28471c247f9b4b SHA512 25521f78842c613c20c10e43d8f8c66b790bd974f6009bc34cb4f834f2eb80c650e989372ed59ddac7a4ea4696516d398f371430513e7f6d82baf04efb52051f
 MISC metadata.xml 500 BLAKE2B 0e8630c46aac418e4cb37ff792c4f722254504ba15bb1880efc85e7e82bacaea2b435295177997a7341dd586bd3bd3dc2fb5e6d2bc9f678622e9de612d97baaf SHA512 c6a74517c3ee5a5f7495353d057c2f6ffbdb22c9a26a12893473f23c78238b771802f0f963aa1bc2250115925e23b15a3ca12ac1d0df895ebb5f2659d1057237
diff --git a/sci-libs/ipp/ipp-7.1.0.079.ebuild b/sci-libs/ipp/ipp-7.1.0.079.ebuild
index 307e7c0e4ae4..e6ff18149362 100644
--- a/sci-libs/ipp/ipp-7.1.0.079.ebuild
+++ b/sci-libs/ipp/ipp-7.1.0.079.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.117.ebuild b/sci-libs/ipp/ipp-7.1.1.117.ebuild
index 9ed49be71f15..71f55b5718bc 100644
--- a/sci-libs/ipp/ipp-7.1.1.117.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.117.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.146.ebuild b/sci-libs/ipp/ipp-7.1.1.146.ebuild
index fbc627c795aa..86f0c3766b74 100644
--- a/sci-libs/ipp/ipp-7.1.1.146.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.146.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-7.1.1.192.ebuild b/sci-libs/ipp/ipp-7.1.1.192.ebuild
index f4c227f95669..edfe81140352 100644
--- a/sci-libs/ipp/ipp-7.1.1.192.ebuild
+++ b/sci-libs/ipp/ipp-7.1.1.192.ebuild
@@ -10,7 +10,7 @@ INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.0.1.080.ebuild b/sci-libs/ipp/ipp-8.0.1.080.ebuild
index d277b4b54894..8396137d987d 100644
--- a/sci-libs/ipp/ipp-8.0.1.080.ebuild
+++ b/sci-libs/ipp/ipp-8.0.1.080.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.0.090.ebuild b/sci-libs/ipp/ipp-8.2.0.090.ebuild
index a0d811280079..d43947ece3e9 100644
--- a/sci-libs/ipp/ipp-8.2.0.090.ebuild
+++ b/sci-libs/ipp/ipp-8.2.0.090.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.1.164.ebuild b/sci-libs/ipp/ipp-8.2.1.164.ebuild
index eaacbe6a2faa..a1f5a2a57052 100644
--- a/sci-libs/ipp/ipp-8.2.1.164.ebuild
+++ b/sci-libs/ipp/ipp-8.2.1.164.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/ipp/ipp-8.2.2.187.ebuild b/sci-libs/ipp/ipp-8.2.2.187.ebuild
index 1be53f0bef16..c9ce9ca2f3ae 100644
--- a/sci-libs/ipp/ipp-8.2.2.187.ebuild
+++ b/sci-libs/ipp/ipp-8.2.2.187.ebuild
@@ -11,7 +11,7 @@ INTEL_SINGLE_ARCH=false
 
 inherit intel-sdp
 
-DESCRIPTION="Intel Integrated Performance Primitive library for multimedia and data processing"
+DESCRIPTION="Intel Integrated Performance Primitives for multimedia and data processing"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-ipp/"
 
 IUSE=""
diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 9647e742e8d5..ccccd5c34f07 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -2,7 +2,7 @@ AUX libcerf-1.3-autotools.patch 2758 BLAKE2B 29bb371d1ce1794762df0a18b25110cd883
 DIST libcerf-1.3.tgz 385600 SHA256 d7059e923d3f370c89fb4d19ed4f827d381bc3f0e36da5595a04aeaaf3e6a859 SHA512 274fa7f3b149bb27582a54a39fe76b478cd5acc6716dd0588a2f637b77c87a6bbc4f467b52bb067ebad2d1ba18750211cc71c6a6feef75fa08d01ac1dbf5dc56 WHIRLPOOL 6f003e26aa76458da620dc4261cfc3b9ec77882a62e5f1a42ffa83c252ae39399e1244c16ad101ff98469ed59970be04b5f901a418e9681f7657adc76e0698f2
 DIST libcerf-1.4.tgz 386065 SHA256 101265dd1e1b10339adb70b22b60e65ef12c4e01c4a3f52e508562eceef62272 SHA512 93d7b03898c0f88e436947b204db7fb5097dc901928aedde48bf0a04552e1c041fdfcdbe6318fdc21508e1349b6c205f557660550e72d6e86b078d9d0dde0faa WHIRLPOOL c2f3093e7a080dde5252fbd91fb62ff3abccbf2d900cd21c6a54821ec8fbc2e4326d1dd60d838111a9d8853e19088453b886a34415e018dd1b5d276d6a86c5ed
 DIST libcerf-1.5.tgz 413926 SHA256 e36dc147e7fff81143074a21550c259b5aac1b99fc314fc0ae33294231ca5c86 SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3 WHIRLPOOL dd63b6d3142d311689a79e028629f41d157cc94e0204fb1dee3ef81d6c83cd72c8187d120f0600b8b27dd3fa7920887348745873ad3361dc5adbcf66857ef78d
-EBUILD libcerf-1.3.ebuild 645 BLAKE2B 1e500cee397efcc29b8f4ef3b99191495dc23d37f8583d3314e25df5b58c75a667a8f620002df533d2b3371e5964e34eb86c251c6657b940fe4eda8c0a09a78c SHA512 e5e7d05cd77fecd8bc3edcff851487c7f0d13202c6372cf9fe1a24887a118048a8f8cd6894f5288b97d0743e8abc2e500cf8c94ca35e47e244953c0fb498e15c
-EBUILD libcerf-1.4.ebuild 739 BLAKE2B b118eb872f076c47a1516ad10c6a4cc3153b0389d25c1f19e4bf7f850600957a42a0eb0787c721b9b4a213a176e35cb28a65b08bb42ba37388eca61dc4d38990 SHA512 00526c5fa222f5a6fe48b790060326aab9ce266b58447ee3eb5bd737f7d142a6602016c77c42fd997ef3576d1a0a011ad049aecd7c3de5cd7f0533f10f0d2332
-EBUILD libcerf-1.5.ebuild 798 BLAKE2B 504a4f7c3c17f09a71447c438d429933d05c20cb5befa66844dbf003ddd66bdc87d014e025fc18692789570c033f0f4276bb043acf38117403eab650278e77d0 SHA512 267a1d89664cc5054142a48bf135bc11c76dd5a6ed8a9d63adf85692df615132624c4d5812a9127d4e6190c6d20cd1b5b0258c2a020cce8d241fd229a4a916d5
+EBUILD libcerf-1.3.ebuild 620 BLAKE2B 261a0d3b341ba163968d3139272c334b3d9014cab43edcb31d19052c6411ee1d1809f238b9449f19adb2d25f081f8f140e68d2f172a68970fe032d05b743b704 SHA512 f2911dde75cc0e1450d3099e50efcd4454056f778f67dbad83bc98c93efbcfeecc4b08003790db7690c56c12d41be3ae89729b0b251e978d1c79422384be3fd7
+EBUILD libcerf-1.4.ebuild 714 BLAKE2B 2cbbaed958231660350ecd969d5801f23bb664a7c7d9644f1a9e4065455a90ccc486a91d6dc8467d01693631f092c905418a22aa49441e54bd08324867b1907f SHA512 40f624c2ec77adcc602ba80205418db80ec4a50baf7538ce871e0f4b73d403bda660d36accf0ed9a4758ecddf72aed96144a81d97c7863cdbdcf1df258fe6eba
+EBUILD libcerf-1.5.ebuild 798 BLAKE2B 2f88e09285760980785d131e71670875fb9390a852023b3473f67570e9bb4141044dd534cc4dfe0d021ee7bd094a430c9759714b5bdc1cc0b844b1d374ba3563 SHA512 69f3428a87675a6d8e703d3e19a0dcd0c30d5134a70ac9482eae22a4f83dc9488b1fc52b5e3a6ff2d987e8a54287c7ad0dd28b4c3e98fe050d7a132f7aa73dc4
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/libcerf-1.3.ebuild b/sci-libs/libcerf/libcerf-1.3.ebuild
index f67d7d57f041..acbe684d255e 100644
--- a/sci-libs/libcerf/libcerf-1.3.ebuild
+++ b/sci-libs/libcerf/libcerf-1.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils multilib
 
-DESCRIPTION="library that provides an efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/libcerf/libcerf-1.4.ebuild b/sci-libs/libcerf/libcerf-1.4.ebuild
index 670cf094a2f9..ccd7129f576e 100644
--- a/sci-libs/libcerf/libcerf-1.4.ebuild
+++ b/sci-libs/libcerf/libcerf-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils
 
-DESCRIPTION="library that provides an efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index d9b9afe5569c..02ad27011f10 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-DESCRIPTION="efficient and accurate implementation of complex error functions"
+DESCRIPTION="Efficient and accurate implementation of complex error functions"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/libcerf"
 SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
diff --git a/sci-libs/mmdb/Manifest b/sci-libs/mmdb/Manifest
index 75a4127da401..52f738e646c4 100644
--- a/sci-libs/mmdb/Manifest
+++ b/sci-libs/mmdb/Manifest
@@ -1,6 +1,6 @@
 AUX mmdb-1.25.5-include-path.patch 362 BLAKE2B 930b83c0afe026aaa385853de8496ebbe5f49b4c78590a42a68ffa6c22697d4e67051897c29e7b110d2b1c61ac4e5efc7389afa5a0afd0db77d3d5d0a6b7cf8c SHA512 60b110b173867c4b3eb45ad370141950046e248dd94d6496e8c8a14a72051a24cdfe805a2401083d53b471893d4e528a8f953ed28935393ab40201a973921f3b
 DIST mmdb-1.25.5.tar.gz 732911 SHA256 44c614e2fa24aa492f2aa1852d2d12f440f5b1de35441cdba131db941ea3db4d SHA512 19784f119422e176ff97c0f40256815584ddf2156570593047125ffaf509c961840619799ce20c43efb330d22f068f96c061d31aa5bc5851f538da1742152ba0 WHIRLPOOL c6e5792a6f5456771da711a8d6f07d2fbfb6cc6e59aaab01176d63c2e29552e14dd41be85ae29800bbd26fde9ab76ad455a4d95e33c0faf7e5eb1d0f00e76867
 DIST mmdb2-2.0.1.tar.gz 721759 SHA256 6df04205747ae35cd62edc9649ab0187f902a56fb16f355cbdbdc7ca3e14b6bd SHA512 00465204aa2b76867f805259d25653d48e0e4fe5eabb3929b86a9e3ae8d88345737ca187cfd21dc6c2808e6e8da9c9d61c11be2f587e733390bc69e5ef87b7cd WHIRLPOOL ab78e08739467bb62703f91abc37a6583cc189e0b90dca2bef4fa825a3f8544dcad5c914683a2bfa4502b016e6c958e6ca0597ceefddfa5b99078108c920edfa
-EBUILD mmdb-1.25.5-r1.ebuild 517 BLAKE2B 2815cb591ff99a416e7762c956440d390b25908dca1a2f8b27743e67e9e28b6f1032514af2174b7986e2a3da45bf253660d398737fdcec9fc1887a6c079a269d SHA512 e95b84254904bbe9aa636bb5c88d8186d1e83e47df5592ff21facbea1c64e6467c62f5ce94a291c291f7c62789bd39bd2de53ea6eb566d492100d0d2eaaccd94
-EBUILD mmdb-2.0.1.ebuild 514 BLAKE2B 64e7a982184eb40c82b817636c6e18b79c4fa304243f29ec2acfe08ed292f2227ba3e9017cffa8ab99c6519008f5229e29d6ca608cb7c36783e08f015f3f1e8c SHA512 f510d64360d06dbc6ade9423022875047ac298eb56ceedc45c13a862ffd53e081bfe63fe2c2ad604d99f1948c7217cc7ed1f3b4af2d1e41c91b5b62e6425440f
+EBUILD mmdb-1.25.5-r1.ebuild 487 BLAKE2B 6d600888c83ce61aa55575f4b1593b4144b741521ce345220f350e429efd5e734d73c10a77470ed676818f0ed9fa2710b9dab0168a2997a6b0f0aa7c7fa82c88 SHA512 983840011e3e1fe935b61b5687d80d21c2358b3b521768551f34c3c81a16522e6ba024d0d470d83d67dff17ae1bc6294c30855a269c29dbf0f91d84e8c2de62f
+EBUILD mmdb-2.0.1.ebuild 484 BLAKE2B 320fa1dfb1c044c237b78c902af2ba2bcbc8f98b453ae416ea69f624d8873a8087bee4895547546d4a958bce6767115622f288bac33bccb00e9c19822ed8b999 SHA512 a0cd76203854c4b8963e9d3ee5846d3538887b4f8d3d12644591d98b3659ce1b1ec95fecf118e76e21ca7f885e9ab8575976d1a66976ffe2262a71f5c5a97bee
 MISC metadata.xml 347 BLAKE2B c20fb359d6159c1526170b6a97b97413e4d13d6cd824ca18ffa1605e5afb5df030e88bed371d3716489dab5a23c6f482d995df74f31d2853ab0845c44f92f405 SHA512 4638d7dff2f4e4b84c0acb9f4084141bede8166faf8354ef61656597f69584493f64f7552c3f79849d8d910cdfb93292ad1625589e1f9aa175ea4e2e26af90f8
diff --git a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
index 5e96460fb6c5..e62be82bfb06 100644
--- a/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
+++ b/sci-libs/mmdb/mmdb-1.25.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit autotools-utils
 
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
 HOMEPAGE="https://launchpad.net/mmdb/"
 SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${P}.tar.gz"
 
diff --git a/sci-libs/mmdb/mmdb-2.0.1.ebuild b/sci-libs/mmdb/mmdb-2.0.1.ebuild
index d93f9549df5c..e227efcef4d9 100644
--- a/sci-libs/mmdb/mmdb-2.0.1.ebuild
+++ b/sci-libs/mmdb/mmdb-2.0.1.ebuild
@@ -7,7 +7,7 @@ inherit autotools-utils
 
 MY_P="${PN}2-${PV}"
 
-DESCRIPTION="The Coordinate Library, designed to assist CCP4 developers in working with coordinate files"
+DESCRIPTION="The Coordinate Library for working with CCP4 coordinate files"
 HOMEPAGE="https://launchpad.net/mmdb/"
 SRC_URI="ftp://ftp.ccp4.ac.uk/opensource/${MY_P}.tar.gz"
 
diff --git a/sci-libs/pymmlib/Manifest b/sci-libs/pymmlib/Manifest
index 55a5c06c6352..03549746cde5 100644
--- a/sci-libs/pymmlib/Manifest
+++ b/sci-libs/pymmlib/Manifest
@@ -1,3 +1,3 @@
 DIST pymmlib-1.2.1.tar.gz 37480403 SHA256 58e678be6056e40647fd28fec048571563402802156912bb3481852698179738 SHA512 96328fcb8af70a271c0960be753c677f716d3b15c41519c320a1240fd9ad584fee173ab3a8e528c9ae198efea95d20863f64627e44d1a6726513f2916d93b464 WHIRLPOOL 96ba086514c22c7431739fa50908cc9e7678adf864c1402117e1d852b202e9c1da99c54278bd96861f3f4360ea72c25a04e49c7f4b65621e21ec6ee5f8ded774
-EBUILD pymmlib-1.2.1.ebuild 1036 BLAKE2B 7aca81a63360c53de3d31ebcf73dc9caa8adc2e9312b134e8a39bdb9fe3516353b4f893ce97e3d39068c67bee6c0315bf5facf04dc283c9e07c821756dbc2c37 SHA512 e4989b361596a94c001bf7f5a356632257f1df5865e153f34e7b095668c96f1fbd999fec737e7842c258ad549a00e548f4cc2572a7750bcd3a28fcb837bc4f5d
+EBUILD pymmlib-1.2.1.ebuild 1025 BLAKE2B 6948903b6d4c200b297e66a2245555280d161812c7b96a1e8b6c09b12c010bf1bb8de90b53f64d0bb3236bde2bd905f76a4c093e675b7e8ce57605e1f3315cd1 SHA512 2c3321fbaa19d830079dfa4d67a936a3693be0963bfd23722fe0f78ba8693cedba4f5e7b8d9cbf579e3d81fdd699ee49cb0eb571ee8fd18521937e2b74790910
 MISC metadata.xml 352 BLAKE2B 34a1fc3435528c5b6d9ebcdcc8c2fccb94c73905c18470cc1637ddd83030997173f8799f50c6f80e900949bbf7f1d1eed94d026e37a91fb0d708977fc607cbbc SHA512 0b30b2c2b407b9955227536ad72a0ad7583cd4ef5b2b691d44b0adc98e854b8051204666f6c5364a242cb81cefb17669e28744c1c062bbeb7bc207849f77384b
diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
index 380de4cff761..f533643cb1d6 100644
--- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 multilib
 
-DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular structural models"
+DESCRIPTION="Toolkit and library for the analysis and manipulation of macromolecular models"
 HOMEPAGE="http://pymmlib.sourceforge.net/"
 SRC_URI="mirror://github/masci/mmLib/${P}.tar.gz"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 15582a633e7c..dae2c52ad8b2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest
index 552738f133e3..c527c8302010 100644
--- a/sys-apps/arrayprobe/Manifest
+++ b/sys-apps/arrayprobe/Manifest
@@ -1,5 +1,5 @@
 AUX 2.0-ida_headers.patch 16391 BLAKE2B b004f86dcea5e4789245bf9582d96356fa969a0a46ce994d59e9ef614057891d227989804a82488609974e06328814f014822a827c52038024f6bb71d9d663c1 SHA512 ff3e06dce610866362a020137b4c9c45802ce4a2566bcf01930c6351ef51aa60a2ad80bc97a7207f8644f58a5c1fe7722d0ccd20f7740eb06ebac8c896f9ebab
 AUX 2.0-malloc-strlen.patch 1152 BLAKE2B fb8c24e8bcba49d2cd52e15017da72b5f691dcef84d3774eea789aee81bf0b9ddec8843ed96c97c75da0f3ee53c7d771215c9a08388ebcf865ea6cd5c36f5828 SHA512 19f112d1e830ebe769025f3327e793d79d9f943324393a5d466bbda852a319201525a469d0f41bbc0d4d4d2ef8212c525d6300c80d5fc994df444b96f3729bc6
 DIST arrayprobe-2.0.tar.gz 83831 SHA256 ccb560b5c7e8b378d110cad6e9245884e7e673acfa3c4016ef33acd699f1f4d0 SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870 WHIRLPOOL 56eec2322f806f25e411614e12e9c584208202203f6d070846c73d04c0b379103ad2c45d3a6638a8cf6d66ea51173fbf0dcd91af3b01702a39848bb8a503cd34
-EBUILD arrayprobe-2.0-r2.ebuild 579 BLAKE2B 5b70bc1ff2f2f7f75e17331c805d7ae9f578f665c277aa8039fe8b70b5fd93a1367cda0eb7ebb22c41f1f69cfac9b63d89efd92ccd4e57fa4bae7d57d626fef4 SHA512 4e826c92ca4092438f66089758c8d409bef0d5931fb3c8996f6018811fe4786e7ffd74e899f9e57aa098ecc9e6c92ca8da284c4d9bd772c93b5e831c5d2eee6c
+EBUILD arrayprobe-2.0-r2.ebuild 559 BLAKE2B 2454b9340be56d75938eb7f59d9f7c0cc14a50c9d9f00a75aaa85aaba73c25719fc9afa95a0aef2b9bda8a8156ebf2c9e5e87ee9d5a08a1009ef2287bd3367c9 SHA512 43b644482c826a3f5510e55d129c7f6268722b89180d09e80008f35e4eaef7fa7068bed3e3cd1c10f222631d558f47a96e15997f4f39dc201572897e7d6370fc
 MISC metadata.xml 330 BLAKE2B 30259c749509242f02c31dd55057f4ab4ba7e13cdda877ef28e5a66c6d4da5b12684bbb6a2e144cae18cb6dc9bbc1b5c1fb14b1bfcf17474151a6624a1041036 SHA512 a7b0f31767ddd2a38acc2af4700f6129e6a78553f6bee63827d7706064570dccd5e5bf48b407b9e534bef4bbc6b384c326a79121079e68d25e3494601b3b0e1b
diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
index de2a25c918d1..98fae16e7682 100644
--- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
+++ b/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit eutils autotools
 
-DESCRIPTION="CLI utility that reports the status of a HP (Compaq) array controller (both IDA & CCISS supported)"
+DESCRIPTION="Utility to report status of an HP (Compaq) array controller (both IDA & CCISS)"
 HOMEPAGE="http://www.strocamp.net/opensource/arrayprobe.php"
 SRC_URI="http://www.strocamp.net/opensource/compaq/downloads/${P}.tar.gz"
 
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 880b441cc304..92ca0e689a06 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -4,9 +4,9 @@ DIST collectl-4.0.5.src.tar.gz 624040 SHA256 77839c6132c2ebb0b3c941163337bc31468
 DIST collectl-4.1.0.src.tar.gz 625147 SHA256 e50d2c6946b0ed243136f02c18a64b47402f64ee912cf2fef4c37f9f00d65770 SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5 WHIRLPOOL 7cb82bd13859ba561ed59e65686c6294f36c4d98957b83856e41e99adf8a6ac9f84eb36706752323d00e393b43eb7c9fd325dcd50f1251d027c3b32445fb0968
 DIST collectl-4.1.3.src.tar.gz 634862 SHA256 c9fa7e4a66fe333471bd485a8008b171fdf431faa79d9b43fa830ae7d6c85bb3 SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8 WHIRLPOOL 2fd065be105f17f82d3ff3d85fd2508d3e86f6fc4272b5f84888390c8a76fd2d223dbb79c28701044561d8d2d2ce6f36da082871f0149c94f3486ab8a3dad8bd
 DIST collectl-4.2.0.src.tar.gz 634317 SHA256 bf4c52d315d4e754b8275f6c6a9a48188c440f78c4307e5f72abcb518a9d07d0 SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855 WHIRLPOOL 6b9c46d287128b702662ffbb83a96611974240360d4b8ce5c44c3675bb7d1efc49e4584994327359fd9545175f483bd6dee70081ca6f7e4f0ed32d3e4276b021
-EBUILD collectl-3.7.4.ebuild 897 BLAKE2B 26f588bfeef776059eed5e7ab5722ee8f7dcfbca632534448bc5b37c8ec65de70c1c3ae150be5127d9929a1288a6b5a04a6f6b3508e6fcbd35a8bd9bfe620a5d SHA512 203e16247639293ecaecf3aac3d28778d64a8949f9138e53910819996b4481f8e2516d23bf4b46592928815aca833c52b919e100467fd58d5f0a512743ae70ca
-EBUILD collectl-4.0.5.ebuild 899 BLAKE2B ba349e811dbf71c2adb2981ac134662120aa9c3dc3986ad087ca2fbab3939d5dde1726bc0ddb7312bc86bf4211e4b14f7b060bb3876ed136d0e8a424b3837b22 SHA512 45c794667a101e5de32c43045725fc58abc305f7b7d8452738c8c6df02e01bd792a88d33be9d41ca7e58b2c6668ea9c8e17172439c3abf9134d492c77db66247
-EBUILD collectl-4.1.0.ebuild 899 BLAKE2B ba349e811dbf71c2adb2981ac134662120aa9c3dc3986ad087ca2fbab3939d5dde1726bc0ddb7312bc86bf4211e4b14f7b060bb3876ed136d0e8a424b3837b22 SHA512 45c794667a101e5de32c43045725fc58abc305f7b7d8452738c8c6df02e01bd792a88d33be9d41ca7e58b2c6668ea9c8e17172439c3abf9134d492c77db66247
-EBUILD collectl-4.1.3.ebuild 899 BLAKE2B d26f37f8d7cc85851bf264642156982729df49ed93158aef355ef09ad7635deb74de9764957e73a2c1b07a33f0ab97979ae8c4b155f9737ded91c42236223cd0 SHA512 8d29c14b653a82fd869c5ee9d0a520528c20740d0a6e2c84e44518909247ede8a7024cb4aa565153f08237c2e0a1345cefee8059e48d841f780bb9c26a68245a
-EBUILD collectl-4.2.0.ebuild 858 BLAKE2B 816374554ed6eade18559899e810df8f89e10deed8284d39d7653669647624012d8f2e7b4668dbeacb3761a6db19c44fa9eb5db43ac3ec1864880122fa5438b1 SHA512 5c91dd2f42d5886ec4a4d98cb3bc9e5be6a5a633a973b41a0d915a384ecff2963468ae87bb00347ec71df10dee1f44f59a136245fa7b1a4170be562b0e8d5720
+EBUILD collectl-3.7.4.ebuild 882 BLAKE2B e63145c55030cfef3971416563849a9f161f0a47f1ac55589ec6a43d7bcc6cf21598252ab07fc2823f5b052162d51bf19c34cf86a540bf6c284351e9e4e2a74a SHA512 2b09dbe7cc358fece6f20d00bef7ed391e0ae6b94ccd6b018dce3c04b7e3c62c7058adcc5dd4fb634a65c536d5b9c26cbdf201e66edcb515328c83f767430814
+EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
+EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
+EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
+EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-3.7.4.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild
index 433603c67980..be2c0c2b45ba 100644
--- a/sys-apps/collectl/collectl-3.7.4.ebuild
+++ b/sys-apps/collectl/collectl-3.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="4"
 
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk"
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
diff --git a/sys-apps/collectl/collectl-4.0.5.ebuild b/sys-apps/collectl/collectl-4.0.5.ebuild
index 5b05a88c3596..c09f142f8823 100644
--- a/sys-apps/collectl/collectl-4.0.5.ebuild
+++ b/sys-apps/collectl/collectl-4.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk"
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
diff --git a/sys-apps/collectl/collectl-4.1.0.ebuild b/sys-apps/collectl/collectl-4.1.0.ebuild
index 5b05a88c3596..c09f142f8823 100644
--- a/sys-apps/collectl/collectl-4.1.0.ebuild
+++ b/sys-apps/collectl/collectl-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk"
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
diff --git a/sys-apps/collectl/collectl-4.1.3.ebuild b/sys-apps/collectl/collectl-4.1.3.ebuild
index 28cbb8d9b7ce..c7ebec9b33fe 100644
--- a/sys-apps/collectl/collectl-4.1.3.ebuild
+++ b/sys-apps/collectl/collectl-4.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk"
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
diff --git a/sys-apps/collectl/collectl-4.2.0.ebuild b/sys-apps/collectl/collectl-4.2.0.ebuild
index ac6f8b9d5c1a..c22ce227a617 100644
--- a/sys-apps/collectl/collectl-4.2.0.ebuild
+++ b/sys-apps/collectl/collectl-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk"
+DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
diff --git a/sys-apps/gscanbus/Manifest b/sys-apps/gscanbus/Manifest
index 58b55297b72e..bdd1752e8e21 100644
--- a/sys-apps/gscanbus/Manifest
+++ b/sys-apps/gscanbus/Manifest
@@ -1,3 +1,3 @@
 DIST gscanbus-0.8.tar.gz 215739 SHA256 5fd7c9e4b52a91cf3714ed284bf1fbf95ce45efe0413fce78649335f24278135 SHA512 a5f97acb57869b151fbdee5747510f554b8d67b1889ce199ba803bc75a91d1a8b98239799ce61d775923dfff0767db518a46cf9222eb370150ea158eecde95be WHIRLPOOL 559a5a76cad23653481965e93adda8c5e6ec3a917afe3ca57de55cd32acf1e8db8a1397c63980a0c8eb2b1c834c340312c22ff6d9a618a31a1d8621903cd7df1
-EBUILD gscanbus-0.8.ebuild 520 BLAKE2B 2122a8a5efbe9f781c4a3d766fd8c7adc7fbc143fb14e57b6824e23155e33d9f83d98030253b5d6ef635a5dcb993cde19c205f55d0daf8a10110a35cae1a95b7 SHA512 a83429f77c55eceff0de3979273a60574fec33aa4419d4c850d5b60d3e40df974e00efd278fb8c0ba2267079d05c31ceb7eb8765942eec1d2a296eaf0cf85ef8
+EBUILD gscanbus-0.8.ebuild 506 BLAKE2B 15123b3ace3451be088308a68ca132324509329e45e8f14665fb63c43475577eceda5f317c621266db97ba7d0aa9bd19d4704877cd312c643c780cfcb1c47a14 SHA512 7c42011df8d0d66d59a94509143612c120067dce24b53b0e7eeeeed17a8bf1ad0aa8dcb69bf7dced17a7d6f3b7bd0e0e25d3350a916e30352dd0f9151ac2aa29
 MISC metadata.xml 336 BLAKE2B 0b5dfa774dbf36c91ac6b37b851a7c673057044a4831472082a583cda88d20c75da5a6903d26d58876c9d7a352f4d95117f66e2de11bfe33b0ee33e3db6b21a8 SHA512 f40619fce237b7474a6d8e8dd9e6f2a145b035f0f83534e298485f92f15a9ef4ef343db5a552d412dca548261a4ae0dba4efe280a988e2b95c08f3179b644f43
diff --git a/sys-apps/gscanbus/gscanbus-0.8.ebuild b/sys-apps/gscanbus/gscanbus-0.8.ebuild
index 9f2b0373e8c0..693ade0c091f 100644
--- a/sys-apps/gscanbus/gscanbus-0.8.ebuild
+++ b/sys-apps/gscanbus/gscanbus-0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="a little bus scanning, testing, and topology visualizing tool for the Linux IEEE1394 subsystem"
+DESCRIPTION="Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem"
 HOMEPAGE="https://sourceforge.net/projects/gscanbus.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 
diff --git a/sys-apps/ibm-powerpc-utils-papr/Manifest b/sys-apps/ibm-powerpc-utils-papr/Manifest
index b1a1b3166727..7e51d3af40be 100644
--- a/sys-apps/ibm-powerpc-utils-papr/Manifest
+++ b/sys-apps/ibm-powerpc-utils-papr/Manifest
@@ -4,6 +4,6 @@ AUX ibm-powerpc-utils-papr-1.1.6-removeinitandvscsis.patch 949 BLAKE2B 64056eac2
 AUX ibmvscsis 1674 BLAKE2B 35275773582c68f649e91d62e5a3f6c18e8eaf6a8b396cd74747284b7a650892d4c6e63bca9a2a99daa54da21dbdd8eb9dc4a07786a01906cd5369893182283d SHA512 130f9a13a425e0af489eb135e48d8f77e0af6a6321ad080c3638a3c122a3f25bee4d9da1f8cea2d4acb234f35f67e4696ed40a8ae818be811912aa77351d3ac8
 DIST powerpc-utils-papr-1.1.0.tar.gz 202321 SHA256 edd36417a21b19a3e8fd277c93b31fc71309ebde44aa7aa4a7813ce4240b1a16 SHA512 4d222373c1bd1a9cadf74110ed0423bd099309d27b6e0f2e3c2d04adda02ad76611c3605954ca67a5a5e869d93241ef756c76b49d6207fc0a68a8eb7cf088a4a WHIRLPOOL f1cecdf61098ecbbc25e2f47e0afddfd1b17fa56758ea371764eecd563ef864a18927e134ebcac5a7882fd0d0f7f52c94994557d6a1adf8056323e62eb9cc60e
 DIST powerpc-utils-papr-1.1.6.tar.gz 231283 SHA256 71e1fe04951c62176a8f224d79183e9b87967edb60c07c65f107f93f9b8c6243 SHA512 e6c532276a4ed6749ee43af539a07be80777674927d2dc9eb65d95a9b57aa0b902e5fe2be65947f9fedd6e060a44657769c6f9faeae49a78cb4803d038f56377 WHIRLPOOL 53e578f39c47a9f019808bf61d2e3e971d2b108749f29ad54a999184f43cbc1c20ad51b647331c70e50ca29f7075a8071f7a62aa6c904913840e9456cde7b1d4
-EBUILD ibm-powerpc-utils-papr-1.1.0.ebuild 1416 BLAKE2B 930e6a120a9b59be594813d83ec81d1906f9778e0a5b76062ecc4d842420f903fcb403e95afff66cc53757e10df2ca089a88ca4e82cbcde23662748ef6b2f8ae SHA512 0721f0e879aab4f45b76844b15480ef55372877bbde101b74ad37e877c70a053762b51acc371a8da9f6d8620a9e8cc48b3011ca7bc97c121b5bdee0c2cbc395b
-EBUILD ibm-powerpc-utils-papr-1.1.6.ebuild 1015 BLAKE2B 50f3e575a7ad5112cd0a1d1cf021bee53ed6105c832a35bad5b9ec36f9219e0b17ba1a0cf60afe825e737d42eb0f10f0dd3d1401036e91062ad28d8fa129dc2e SHA512 b9767bf27081067958b0cbd54a877ffecc7e0b4c82165a3684c30035c151ef7025643b17127e38e69f0a8d6c3470e3b3f824e66c2a4b6ac73864c99de52e8959
+EBUILD ibm-powerpc-utils-papr-1.1.0.ebuild 1371 BLAKE2B b604f567e94fc494a79f9a5e2f2971a76ae0eea6b1a52aebe3bb02c6e874cb9eb8ae3f1f0f1e38ed253ba6fe4d8765bbd63df2c6b0c891fb4982d7d5a3b7bd9d SHA512 1ad816c5ded2ed66c71ab5f857d5660a3bb026566060920476b3424ed2b9dfa19846c94d4eca9c4af86c406857601b5872c6b805709ff408bc738ee8f8478fa2
+EBUILD ibm-powerpc-utils-papr-1.1.6.ebuild 970 BLAKE2B dac060ce0e12938c11453323e681303610902e0a27260039b137a99d37db0b19de95ce4dda6d597ac34933154285113c13dcb06574e9525a24ca14b028239cc1 SHA512 746cbd100e9fe21c18669872f98218832a7be5abf22ab60b3272355c651f316a3d2a03a8346973278b81baec9c1850ccb7294eb7348fc1c8528f6f47720c3b7d
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
index dcc95c7e64e4..1d217b3c6e6c 100644
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
+++ b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
@@ -5,7 +5,7 @@ inherit eutils
 
 MY_P="powerpc-utils-papr-${PV}"
 
-DESCRIPTION="This package provides the utilities which are intended for the maintenance of IBM powerpc platforms"
+DESCRIPTION="Utilities for the maintenance of IBM PowerPC platforms"
 SRC_URI="http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-${PV}.tar.gz"
 HOMEPAGE="http://powerpc-utils.ozlabs.org/"
 
diff --git a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
index 0082ac0ce9cd..a78a768b20f6 100644
--- a/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
+++ b/sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
@@ -5,7 +5,7 @@ inherit eutils
 
 MY_P="powerpc-utils-papr-${PV}"
 
-DESCRIPTION="This package provides the utilities which are intended for the maintenance of IBM powerpc platforms"
+DESCRIPTION="Utilities for the maintenance of IBM PowerPC platforms"
 SRC_URI="http://powerpc-utils.ozlabs.org/releases/powerpc-utils-papr-${PV}.tar.gz"
 HOMEPAGE="http://powerpc-utils.ozlabs.org/"
 
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index c8a15aaf3695..56da46d543a3 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -4,9 +4,9 @@ DIST powerpc-utils-1.2.12.tar.gz 347762 SHA256 570173a2712e06cdd34fc6b5c8aef3313
 DIST powerpc-utils-1.2.2.tar.gz 345299 SHA256 692fcc928645f7776334999a02f9bdd3d675932fbf6efbfa49950e1bc62c3694 SHA512 e33b5294aff5d66a61740e4817ff274004f9798073e21a3eff896858d43dfa2dcf43669ece58f0fdcb503d42109d9bf574d2f35a0c06da3cd9139b34a249b929 WHIRLPOOL 5c45079ac419c362ecdd9513ba26f833a048efaee78707f52d7269a9a568c51e49da073cc2b8f7ee090984fb4d17344fd94843392523d76cd8f3decbfac8d76c
 DIST powerpc-utils-1.2.25.tar.gz 367466 SHA256 2d9a0d4b04ab499ba1362844d65a4e21df0532578a2baa1fe18fff58dc8f32d9 SHA512 33af208dcd6ef9d66b96ec3eadab2eee48017860db9195eea0c59444a5dd414c326e1a737d6c324396219901ea594baaad6f49c8f3c36f5e806b4923d049b14e WHIRLPOOL a4d273ea9be4c8199c1f6ed25f80e6bbc28f3c653a0665196c10f4e95266b1e50835d0886219671f6fef0916de3b679799de6a2a1772ecad77665b386711a5f3
 DIST powerpc-utils-1.2.26.tar.gz 371200 SHA256 61253cb898283e94fcfde641d09722c3e845ebfd98a46f9bc2ad82167ff51592 SHA512 8c8c45128e89cad5bd1a37699a8b628c269b7fe9d5ebc5893ddce8ea8b77252708f5a2a4a454af71224709a44c999446e5d5b7113ba24efc4227b6ff90a1fffd WHIRLPOOL b024a02cf6feb3032b2599e3ceb5091d65631be492ce6ba9d4f5b832aa617293e3192a16be35ffee3765ef3328496712a497a9b8dcefb61a01ec511f71ed80c3
-EBUILD ibm-powerpc-utils-1.1.0.ebuild 872 BLAKE2B 1d3fe9c17fabb4329fc7c58cbca9e16dcb1fee9193e71239dee9b75ba376a97b152ca377c065376570c610742899daaaef593379b4ba74641b3da264e9b9f56c SHA512 cda11130d39f976a9892a8831dd9b1673742844f3107ee4131b9a9a520b169f345d0e411ed564d0c3d5c6cb989fcbe03237eb3f9e63ae05e68749fbcaa0f899f
-EBUILD ibm-powerpc-utils-1.2.12.ebuild 613 BLAKE2B 5449933a207b19cb702b680f3503695b91a790793cce3d0ba220b96f0b77b3f9cc21ad9179622af63d82ad2cd551843c4bc404a831a16b7b51fd8ae339a39dfa SHA512 928fe6336133171c8b93c280ea5b41c62a799768762059fff70ecd0da5b098abedb7fe1b8b40516d18f99013c847757ea4179e521c702835126c37a884d715f0
-EBUILD ibm-powerpc-utils-1.2.2.ebuild 680 BLAKE2B 08d43225354b3978184165f4c0185ab08778de349f50e57f637a310b9088dc8222cc811c40f353fc1c4fd322356c4d357b1427e2080502ddcca80ebc0723f6a2 SHA512 a4dbda84de5309036305b517f93609ae3e44864bd2583ad125e082409264b66dcc4fbb929452bf8d56f98534726fa963a3f91dbcc87fb66bcefc162aad5e89bc
-EBUILD ibm-powerpc-utils-1.2.25.ebuild 584 BLAKE2B cae827e492ab87fec2b61f48b56683316014fef47465f9c230be529cb1dabd5fe5942035ea943923ae736e3db2c6fe577bdd82ac9ae04a1b7f70efb3509acd82 SHA512 91e0ecf3940ccc2cec13848e9273859825f9923b4d5a9d2b7173b24371d4c8b84e7800c4d1fab194f841f4df8403264592075f9c082156d7ea191439c7ff0ce6
-EBUILD ibm-powerpc-utils-1.2.26.ebuild 584 BLAKE2B cae827e492ab87fec2b61f48b56683316014fef47465f9c230be529cb1dabd5fe5942035ea943923ae736e3db2c6fe577bdd82ac9ae04a1b7f70efb3509acd82 SHA512 91e0ecf3940ccc2cec13848e9273859825f9923b4d5a9d2b7173b24371d4c8b84e7800c4d1fab194f841f4df8403264592075f9c082156d7ea191439c7ff0ce6
+EBUILD ibm-powerpc-utils-1.1.0.ebuild 849 BLAKE2B 463c105fdf1ae376708853c05a97cfd0ce064e6cdd922de85ad26fb595a819b48ddf6cd74b416d4d79257455c8d1600dcfa708edf735ed426a3ddde380d439ee SHA512 84135cbeb4d3e122e873eef82e8f778afb4a2cc9569b5a7434f00579479006532257ada8dfa7a5347dd3e65d425d5f5771234f59326418a80a04c10569b391d1
+EBUILD ibm-powerpc-utils-1.2.12.ebuild 590 BLAKE2B 84230ca22cce4b644322588aaf786a5cc26be9c1ef107e462dd00dfb09ce943f45e160e67e520c5cbf8cf9fd493ced03e0989d3ee28ea6034e19b041f50ab345 SHA512 ce54aeba99fe7fe63b38cffc9ea5cbade543e782bb08926be0c5fd61d4650ee04773cab44ac4130e4bf92b7974d1ef3754dee12e863bdca27203e0c3022142e2
+EBUILD ibm-powerpc-utils-1.2.2.ebuild 657 BLAKE2B 9950e073fc7d86bb3a579174a5fc91f0cb782309e2252c5832a3e0093cc92ab1cc51197dcca33f6b99b7b2f7fda6029cc24e95ca80fd44cb7a08a88926da8bb7 SHA512 341ea057733cc93c0f87015060e3578fad85a65dc1523906f160ea7c619a6ce6c66bbf4c148f2f28cb0e8ecb3f2b9984c07bcf75861944efd30997c51233be70
+EBUILD ibm-powerpc-utils-1.2.25.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
+EBUILD ibm-powerpc-utils-1.2.26.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
index 38e19fa7ece0..cd6fe7a2257c 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.1.0.ebuild
@@ -5,8 +5,7 @@ inherit eutils
 
 MY_P="powerpc-utils-${PV}"
 
-DESCRIPTION="This package provides utilities for the maintainance
-of the IBM and Apple powerpc platforms."
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 SRC_URI="http://powerpc-utils.ozlabs.org/releases/${MY_P}.tar.gz"
 HOMEPAGE="http://powerpc-utils.ozlabs.org/"
 
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
index eef037503475..1a7cf1232260 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.12.ebuild
@@ -5,8 +5,7 @@ inherit eutils
 
 MY_P="powerpc-utils-${PV}"
 
-DESCRIPTION="This package provides utilities for the maintainance
-of the IBM and Apple powerpc platforms."
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 HOMEPAGE="https://sourceforge.net/projects/powerpc-utils"
 SRC_URI="mirror://sourceforge/powerpc-utils/${MY_P}.tar.gz"
 
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
index ada8ea7882f5..b851115982da 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.2.ebuild
@@ -5,8 +5,7 @@ inherit eutils
 
 MY_P="powerpc-utils-${PV}"
 
-DESCRIPTION="This package provides utilities for the maintainance
-of the IBM and Apple powerpc platforms."
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 HOMEPAGE="https://sourceforge.net/projects/powerpc-utils"
 SRC_URI="mirror://sourceforge/powerpc-utils/${MY_P}.tar.gz"
 
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.25.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.25.ebuild
index fe6807f61ca9..e111b9db8895 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.25.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.25.ebuild
@@ -4,8 +4,7 @@
 EAPI=5
 inherit eutils
 
-DESCRIPTION="This package provides utilities for the maintainance
-of the IBM and Apple powerpc platforms."
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 HOMEPAGE="https://sourceforge.net/projects/powerpc-utils"
 SRC_URI="mirror://sourceforge/powerpc-utils/${P//ibm-}.tar.gz"
 IUSE="+rtas"
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.26.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.26.ebuild
index fe6807f61ca9..e111b9db8895 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.26.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.2.26.ebuild
@@ -4,8 +4,7 @@
 EAPI=5
 inherit eutils
 
-DESCRIPTION="This package provides utilities for the maintainance
-of the IBM and Apple powerpc platforms."
+DESCRIPTION="Utilities for the maintainance of the IBM and Apple PowerPC platforms"
 HOMEPAGE="https://sourceforge.net/projects/powerpc-utils"
 SRC_URI="mirror://sourceforge/powerpc-utils/${P//ibm-}.tar.gz"
 IUSE="+rtas"
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index b132d5d7683a..9415770792e3 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -3,5 +3,5 @@ AUX conf.d 133 BLAKE2B 4d77e38035348a26a1dc576cdc681ef41e10104730158e4c3f58ea40b
 AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc359a9ace495ae52b72199e31573307b400ec6e9bea02cfd5e9e136a5faa7b3d94591b3a8c SHA512 66c6c4f30e93f759ca7a9875e23ed82843d9cc728c14c7bc7fffee3fbbafefa57244155649986c547264f500a21d0099efd1195d1810b47370c8f77ed79e4dde
 DIST qcontrol_0.4.2-6.diff.gz 11426 SHA256 11d45cebfe217a8bc0a0dbfc641fc098510c4b521cc83b993bd1fd493b834625 SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984 WHIRLPOOL 2d058db16afbb6b0a3b48bbc81887aad2aa0765e695544968ffa379026a9d38c06d2501133c3e49fef2f82bdb4c7a5d4b6907bdd2625c7ef489fdfab5c3562ee
 DIST qcontrol_0.4.2.orig.tar.gz 18344 SHA256 efe7311cdd460a51475d22f737540e7bb3c4303e5eba97b782d765c8f1e67055 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e WHIRLPOOL 88e251dc4cd42a0f185a04742fbfe7d55d784322483c16c2b74593c20dd84a66b4937fe3f7e6b894c003f580df2fd896527e04b47fa6b2895dfc94a3b6e0ec47
-EBUILD qcontrol-0.4.2-r1.ebuild 1464 BLAKE2B eaa3f6fdd73d29e85fe5772c1ab2470d47b61025a6979deecbf0f6703d7cac038ad80872548793280d7e743cb4cf5996e37722648cc0966205313ff48246a99c SHA512 30c3015badece1cc6fff3769ce1cda6b91f5c1e640df2916d1c083228c63aba28c35ec059504f02ff0ca99df7a7ddd2592277f50afda70e1aef885b11ccacb16
+EBUILD qcontrol-0.4.2-r1.ebuild 1448 BLAKE2B ce53dbf508b9432181c7ef5a32ee7d03e883fea279d45cfa5a4112c2bb36d7dc95eef25e717a2eb963dfe6ab268755185a2532ef6fa3a8ca98eea949f56ebed5 SHA512 7ca0a56ad49b33509c794bb08b2dc0f0163d258c1a29b36818ae03a86bd753913837b4017b7ae481ea8dceec117a0318fd3eb8eaa56a30f733eecfff5c5d93cd
 MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
index bdda8dda130e..a5e90afd14d0 100644
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
+++ b/sys-apps/qcontrol/qcontrol-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Allows to send commands to some microcontrollers, for example to change leds or sound a buzzer"
+DESCRIPTION="Send commands to some microcontrollers, e.g., to change LEDs or sound a buzzer"
 HOMEPAGE="http://qnap.nas-central.org/index.php/PIC_Control_Software"
 SRC_URI="mirror://debian/pool/main/q/qcontrol/${P/-/_}.orig.tar.gz
 	mirror://debian/pool/main/q/qcontrol/${P/-/_}-6.diff.gz"
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index faff14f54c91..360c4d34c0ef 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,4 +1,4 @@
 AUX vbetool-1.0-build.patch 537 BLAKE2B e22826304e84fe21f577c3c7db754194103ca97a9b2647063469241f5c213182f4c80007823ef1caa6d79af1d313d560b1e06ebfaf757ec876a618117f2fbb3e SHA512 1b9b1b7471f09ec6dac8f535df1ea6bf09f8824f58c025b92e3e5d3e451a56e750e93836d03ee37e20f14868a9b75e97c548add36256412dfc154530c7a4be12
 DIST vbetool-1.1.tar.gz 182826 SHA256 4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954 SHA512 09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96 WHIRLPOOL 9b6d6b616c0b074e49c80291e48e2c951e83a2981780cf942ca535f2909e7e83a0d7cf1f9efdc6cea779a5db688635bb7a3740c3bd77a80a268776dea9b1d147
-EBUILD vbetool-1.1.ebuild 666 BLAKE2B 22f73bc059b9b72f0f246f72dd10818286a7f973bb12c45a1452d56a840fca5d0bfd56f95119a8b7e23ec6e627168d2a3c600da455fef27b34cdafb4927056ae SHA512 95469f6822c95e15d225c263f7ded56eebb186509f89b27bd01a57990f4f621bb5eef5c97be4e8f0b7c1fec13b7cf9547ecd146ed8368f21b4a8af648ed1a2f5
+EBUILD vbetool-1.1.ebuild 660 BLAKE2B a6570349d22aee9e6e59682658cbd68f56bb1c26f253a11fe90aab1df6674ea414d216f9ffeca4d41bc19da27c71845ea427e471682dce8dd6e3a763ff3239c3 SHA512 d45fe17ff11f433c53357bc34b0709805a9f1d3eb129fce761f450ca0a3fc0654afda8cf19a8434f7a51fe03e71c5d24a4ab8fc9b1e2aa1f41c25bb6b9a83d37
 MISC metadata.xml 309 BLAKE2B 9eebaf0a2c9bddec7b166ccc276008e70956fdcfbbfbb4c996f23cb09fde3047048e609b9a3c412d3bac383aeab874f505166be8b7362ed3d40387108cc4f604 SHA512 9068ab08a41974b1d807c0beb90e289c9fe22e70299c164d65d0a3e051a46964b91d77b5045df9f0dfdc7f23e1ee6d918819456f27b878890e343c86280b422c
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1.ebuild
index 0640554581a9..60ec4a9872c8 100644
--- a/sys-apps/vbetool/vbetool-1.1.ebuild
+++ b/sys-apps/vbetool/vbetool-1.1.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit eutils autotools
 
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
+DESCRIPTION="Run real-mode video BIOS code to alter hw state (i.e. reinitialize video card)"
 HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
 SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz"
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index c55a6a27bff2..59d77c850cf3 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pam-script/Manifest b/sys-auth/pam-script/Manifest
index 9882889b67a8..01787a7c1173 100644
--- a/sys-auth/pam-script/Manifest
+++ b/sys-auth/pam-script/Manifest
@@ -1,7 +1,7 @@
 DIST pam-script-1.1.6.tar.gz 326758 SHA256 d7cb2fadf8db8fcd099a7a7151ec1b018e79f110af79955df0e0081ea3a93e1d SHA512 4c0f03e4ee3ad062c0a6c71982c283e944cd595d3af656f149ea89b583568373f72478130a614cd851f12a1440976abcd51c8932c5fd4753858d13d91888728a WHIRLPOOL 7bdc21db809f61243d3750a74f038cae3a61f2f5ee66c12a12159fa2094b6dc7f9ce9e3c095a0c4dd258dbda277d85e0c29f30047e1255cf35412a7ff0399c98
 DIST pam-script-1.1.7.tar.gz 328385 SHA256 ae38ed76e8e5aec47d6838212b92ce2ced4ba93adbdcfead69f956703a809ff3 SHA512 c0e1df7d3b91cb5be4166fd4680556d5ee4f74df0de299f3629c91081b89ab58390d7b5d0dde5acf3509b30a62553d08e4b2fdf154bce064937f45e2ec08db35 WHIRLPOOL 9c743a5de6695fae8433a1d26fddbb95e67276f382c106116b3fb9ddef80a7f283fafa13cce0f7212caac0fe6162f0f94eff2adb53834d154fe8127ca8df5220
 DIST pam-script-1.1.8.tar.gz 36442 SHA256 d6f85dba8856503a6d74cc95b15cf1f6e45ba2b8ff00675ba8dfe50b519b1251 SHA512 c4b99c69a759b6422189707c52439a6afe59e32fca6238acf00116ed104b625920fb36b3e1f0aaf5edc77325b1f7b10d52ac2530d85cec53d941ae906e077543 WHIRLPOOL 45506733e685f2dc35f164d615956b9c04110d7bcc397b8111f418974cf7268a19557123438622375521396103b3b96387988e8baa17062cd166eba816342b69
-EBUILD pam-script-1.1.6.ebuild 831 BLAKE2B 1c832bade436be36489d0cd409c5ddc3af189333c8ca60ee79149875a58544ae56586396f6a9a4925e1b65e4b0c0c496229afd49689f7f9ca94222c7733371df SHA512 77551001e87b118445af8d796014547263db2912eb4d565ef2c529bb43d9d552032adb418cbde4a4708948a52cb25068f0dc38c39a146c0d847a12d8f23d0470
-EBUILD pam-script-1.1.7.ebuild 843 BLAKE2B 3244fdf21e2b12f9a545aba61ee15b255ebf4d6ba1476c839f4797142f9ab6be36114239bb0fdebf137f6d8e956508e4b25d4b66f49712a0f7e3ef3c609277cc SHA512 745456ec3e5bfc14cc0576c28b40f227dca4dd98f81d5cd2fdcba807fa98e332a7057a7815d2f6b183a54f64ae4f81736a17b4645fe09a8b53d010dd7b668fa3
-EBUILD pam-script-1.1.8.ebuild 925 BLAKE2B c841d939fb0d9483b9e497b3aa02fe24a923252d0a88b1812de9bb59108758f81f716f3a124184fc0f6d4beae78ce52bfc4eb826cfdafe5eaaca3b0cae7bf951 SHA512 2d7a346530367ad5f413748b456cd0788626569ecc47b60aae3e02299588b7feca01d0498ed25916d02f484540edb0809847bf49ec7b7985b2f5760d938f672e
+EBUILD pam-script-1.1.6.ebuild 826 BLAKE2B 5e8b5c913f57bd56eaae069ac8cf82f32bcbc9dc939b2bd2989a111d28332e4acc7d47d514bad4bfea2ff1bf03e75e73725fcb8df862428baccd2ce67c07f3c1 SHA512 73c0a9bb484e8888d9b8b83d85efb750ecd39a99f0dd4d2e57c359c4ed8e848ca57f04987507cfb33fe0df30714b64968c6dd7c93dbd01235b884e10a355df50
+EBUILD pam-script-1.1.7.ebuild 838 BLAKE2B ad60afbecdc0c9a4a5beb05cf5cd3e935da2ca5d46b0998aab7b5cd43826c6e29d3d13457d7eabdbca10df4db49b1b09cee695ca76699c5baa3c79c60341a5cb SHA512 a9fcff1a03ba2da8a64d859d74d27cd135d5d21ab50531ca31e5581ef5d2e68bc35d5edd36f4bf5c35c84704c1c0f299781168bd4b2d23fb1b44be9c188db532
+EBUILD pam-script-1.1.8.ebuild 920 BLAKE2B 39f83cc6605db309a147353493310f5b92da37ade23465f5bf9f0838c5129c51eb9665eb169e9ce44ceb35cc49b65ef0eb60f26dd4c688e44bab9981b7a8d9d6 SHA512 ea2908eb29c923ee1519cde4a706d0266080f017f910ca2db798a127058a8c8f14e594de87a80b1af7242baa46a62f42f2870a23360cde0c95c5913f5aceec5a
 MISC metadata.xml 392 BLAKE2B f9ea8d72222397eb83f2243411996075053e2cbf549bc13ddcd6c38463f3b34eb08ad3efff120c443542ac272da5966d1ca83bf1827a0eeb3b234a1e1ddd4c9f SHA512 bf9673c615b2658b2bbed7b240a5c0aa28a3ce5db82f6d34e505bfc2a0aa25979a3278c2bda498adc456196f6243def7255b462677136ebdf3b1be7af0a9f8d9
diff --git a/sys-auth/pam-script/pam-script-1.1.6.ebuild b/sys-auth/pam-script/pam-script-1.1.6.ebuild
index 8e1ac0c3218a..e018fa38f2b8 100644
--- a/sys-auth/pam-script/pam-script-1.1.6.ebuild
+++ b/sys-auth/pam-script/pam-script-1.1.6.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit multilib
 
-DESCRIPTION="PAM module for executing scripts during authorization, password changes, and sessions"
+DESCRIPTION="PAM module for running scripts during authorization, password change and session"
 HOMEPAGE="https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/sys-auth/pam-script/pam-script-1.1.7.ebuild b/sys-auth/pam-script/pam-script-1.1.7.ebuild
index 47ef1c3482ae..ccff348e33cd 100644
--- a/sys-auth/pam-script/pam-script-1.1.7.ebuild
+++ b/sys-auth/pam-script/pam-script-1.1.7.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit multilib
 
-DESCRIPTION="PAM module for executing scripts during authorization, password changes, and sessions"
+DESCRIPTION="PAM module for running scripts during authorization, password change and session"
 HOMEPAGE="https://sourceforge.net/projects/pam-script/ https://github.com/jeroennijhof/pam_script/"
 SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
diff --git a/sys-auth/pam-script/pam-script-1.1.8.ebuild b/sys-auth/pam-script/pam-script-1.1.8.ebuild
index 4329670c44a9..6c8284e0f610 100644
--- a/sys-auth/pam-script/pam-script-1.1.8.ebuild
+++ b/sys-auth/pam-script/pam-script-1.1.8.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="PAM module for executing scripts during authorization, password changes, and sessions"
+DESCRIPTION="PAM module for running scripts during authorization, password change and session"
 HOMEPAGE="https://github.com/jeroennijhof/pam_script/"
 SRC_URI="https://github.com/jeroennijhof/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-auth/pam_blue/Manifest b/sys-auth/pam_blue/Manifest
index 3ed5130b08e2..07ea2cf29ff8 100644
--- a/sys-auth/pam_blue/Manifest
+++ b/sys-auth/pam_blue/Manifest
@@ -1,6 +1,6 @@
 AUX pam_blue-0.9.0-bad-log.patch 357 BLAKE2B f7f6e4371642072ad5a0a9c645af5229167e36ffe2e242b5d0391ce169b59c8e7e083c54d4b02f711f6172737acb962d8f5b312fab1ac646cdf6ad7b8c1b87ad SHA512 cba81accf65e980f47433b6df808b9cdfcd881c222ab599d0d8aec1b487089b38eba6ebaf89272ba5b821b0367e61e8073973e7098f53d81fd6eabccaab87daf
 AUX pam_blue-0.9.0-char-locales.patch 666 BLAKE2B 11718b66138ca79641565f47613ef521e4bc1659b26982d2246ddb11ce744778c4d748d8a72bf714014b82f33967fea0b54d896aa2b786c0b9b7e66d9a6d9a11 SHA512 2a7bcc2f3d6b260a9b4803b0657114a194af90828bd5926ee1887f04304e30d2bfb46c000f190ab1de88f4646620e2c15ab8cf60fa35fb38a1d12f46cf138fe2
 DIST pam_blue-0.9.0.tar.bz2 251688 SHA256 4ff0f6528d29ae77cf890defcbaf16ee2065dc85fe8edd2e6e53d48e7f27b535 SHA512 f611b6e3b509d2b917dd15a82f6fa3219ce554cdbf3bd224981c740bb3161dea67db9275b9bc13cd54644e0cb546eb2bb32dbff7e510170a0911b40d81f2d620 WHIRLPOOL 51a9d6f920b3420187c29a009020d4a9aa3f2598a8ce07bd440e871ab4e493e09bce3cb4cf2d6cef63e734be20f29b1ee2ea2aa0ed6f14add7aa9704f23a8eec
-EBUILD pam_blue-0.9.0-r1.ebuild 1170 BLAKE2B a6ca6b21ddca9e05dedcbc61cfaf3b9bccc75256b2eb6502980a1a240a3cfbdbef94b4203f56ea86dc5b354fb4c8209540c5205a3e02d8b54d058bbd31f370bd SHA512 8de3b8154fdb9f35848674fbf65b0ae1c0b7632723bfdb300bf6db6b9ab94d891c2124658ea42e28cd917a2cd440cb33cf15ce578be3d99e8cfa81f6aadd1b37
-EBUILD pam_blue-0.9.0.ebuild 1086 BLAKE2B 3aabef3690e77372c9a285248997d3df8b28eb1a09157d3cc55777624a8d8192de89a485d9b9ce9615ab35455d06ebbd5a028971382e9a2d4129c02f06c3d123 SHA512 0b0b46012de45a3c10f03b797fe37e1f376a817123468fed893abefaf3d2ac15d6e0c8fd3041d5cb2583013a891578558729af05dc26a65195f025783baffd82
+EBUILD pam_blue-0.9.0-r1.ebuild 1164 BLAKE2B 881fb3df4290178755a6db7551b37f3747d56925fbb58be7d41f658aea8085ef6c275d9f67f9ae892cb20a146bb2d7f52dc15d74d3b1dcfe58306395b3657823 SHA512 40c2029d06bc8a23956b783d1546edfb7e5d8987870a79a46a23a203483bc5a20134867d2aa097c97721207c9e77aefe48e3341ba0b8905d5ad13fb5a0efdf2b
+EBUILD pam_blue-0.9.0.ebuild 1080 BLAKE2B f8622dba6a2dbc122276d5e4ac0882a9dac26e4dc76b9f20160249771e8c12d48f680c233fbad999f534a96e6a6cfc2666cbd748e160e257bd3c70099cf9a810 SHA512 ef672f6788e31c61f7eaf788bb9582a34926345ad2190ce22acbd9042e1a5d2d40920d17b8ac40a46e2a1990c7cb05ce5da6ddb799eb1d0c6fe6aa0c33b748a5
 MISC metadata.xml 758 BLAKE2B 2286b91ded21eb147232180de96a31e1867c46e11468fb7de7169af65fbbfe627f62eaebddf5046c3b8f5d2928acbe8cb64ea7ef98a22d9951dafd381b4a8a86 SHA512 7d33c098fb2422df99f93c068908d3e1f1639d7d5d891ae5f8e579feab19b33fcc3f184c05f27282774b01eed405676edfb3ef2c0f8f4de8e7dd519d8523afdc
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
index 9988f76edda5..83a9e351ffbc 100644
--- a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
+++ b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit pam autotools multilib
 
-DESCRIPTION="Linux PAM module providing ability to authenticate via a bluetooth compatible device"
+DESCRIPTION="PAM module providing ability to authenticate via a bluetooth compatible device"
 HOMEPAGE="http://pam.0xdef.net/"
 SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
 
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0.ebuild
index 2e3f3346ef90..653e48ad8cdc 100644
--- a/sys-auth/pam_blue/pam_blue-0.9.0.ebuild
+++ b/sys-auth/pam_blue/pam_blue-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 inherit pam autotools multilib
 
-DESCRIPTION="Linux PAM module providing ability to authenticate via a bluetooth compatible device"
+DESCRIPTION="PAM module providing ability to authenticate via a bluetooth compatible device"
 HOMEPAGE="http://pam.0xdef.net/"
 SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
 
diff --git a/sys-auth/pam_smb/Manifest b/sys-auth/pam_smb/Manifest
index 1a7b5f828729..6af5123cf3c4 100644
--- a/sys-auth/pam_smb/Manifest
+++ b/sys-auth/pam_smb/Manifest
@@ -1,6 +1,6 @@
 AUX 10-pam_smb-bash-3.1.patch 559 BLAKE2B dda1789cae481aacd56fea39d9440f01966b396e3dfa984b572dfbe339ba0e77d554b3f995c258d125fb6ffba275b8aafb11a43efd02529c111f521239d1bb03 SHA512 4a99c4fa3428dfc01a846c7571c3355d0f07aaadf55e7e43bd57c2cae393ef1c4dff26533d381e88ef30a50ee0e756feeb1c658135057af5d55bea49ab408928
 AUX pamsmbd-init 356 BLAKE2B 833510d8d8285cd066335314424b6c5de28ddaa58f71bccdb957782e99820fa19600e18cd58d0b71b2889ed27e9fe233c1c27914271dc9b5365dd8ee7db4e0dd SHA512 2bf495c9915e025a3c89a127131c2489cca9b76a1995fe3a6c9e473cac22a4b5dd22ef80c42d42c0ddf759ea63ac643096711cb1db9331b8033de7f26b4634f4
 DIST pam_smb-2.0.0-rc6.tar.gz 115069 SHA256 b787b11dade66b1078553fc0662843f3aa9f69629542ff5fd6802d62555295c5 SHA512 c41519ae2b657dd7cbbbeb6d097ec82fd2d0d5c0f51f658eecea98e7aaf4eb87975fc1bc6592d19dbef0a650e428ec69829270a3c119fdab9443cddd6facbe6a WHIRLPOOL c3a5aba05c6eb7ace1aa71dc802a057d4674e3d47bfe1549f41e25d13f750b271e9cb4a730364ba6d8bcabf322609c50652106277fdd7b9c02516c89bc320974
-EBUILD pam_smb-2.0.0_rc6-r1.ebuild 1096 BLAKE2B 3e41b739995b4ec8cad255ae6f905017569d31c4287f808982e19c90bb3b70b9ae846c237e7d7d81123ce2c6171543fa1aefc26d71686360ef12d12b508cdd88 SHA512 92f7e84841de9f014578cf9dcb089db4647f629b5084be7a20175f8f842f0dc43f62640dca6ca9babbb717ccdc02592f13a19ad038f4c4ec26003fe231dd2cc6
-EBUILD pam_smb-2.0.0_rc6-r2.ebuild 1055 BLAKE2B f1a9fa6c12a522cdd9b7580d11a72f854da2758c5723b4c5b6e5a57bdc0b1bda951c185b1c21fd7964da34f86cedd992ca3d51295ab4f7d7a380115a8fd46c26 SHA512 339044de8279ab0482326a688970a569145bc7f8ec745c2007ad90753c2d901c4c915324dc6f923468453544b2249f77d0d8113fe71e061a1cde228e63f81b02
+EBUILD pam_smb-2.0.0_rc6-r1.ebuild 1085 BLAKE2B ec8ea74c097e4238196afa8c9d5b4512d21677e02600fcd9f1de497679b7fe8b20e61e5ac458c450d2822674ff01f24cea936f712023f5c62f7d925e95ae0586 SHA512 30d3e18426a266c19fe1af242a0bc86833fdbd4d0c9170fa4529db8d8be2637be6c1f91f5da90deb754d4f7ef244c477f2da6dbeecafcc6cb3563118b302ee32
+EBUILD pam_smb-2.0.0_rc6-r2.ebuild 1044 BLAKE2B 192d8e3e39f53442fd08828ff3d00b7d2aa7a36ec8e061612f8f28c8a748b8250c8e0220493c6031a8f063ec28ffa896b5144fd769996e52b8e479e4aa083004 SHA512 054bd1f5c837c5d2243a631fe171f672a1e28ca6fc79ae845c498667665714d85f8cac5d67628e4c7ffb1dad3a65aa3f07815dd707d6ca84e6232660e326867b
 MISC metadata.xml 522 BLAKE2B 14999ce0e84599b2a504d46169944de82f808ba9bf4c3ad42525310086354627cf42d765a21d77ee3c17a515ceb06c5ef03105a75a9d7fa846c3f67b2dedf78c SHA512 1ea0b00bb5b075243685de5dd76340ecc64f6694f299c8800039211d721635562f608a702c17394da508ad16dcdd2d88903405155b200901ed698d5b4b16c45d
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
index efee20c4cd7d..87c5bb0a0156 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
@@ -5,7 +5,7 @@ inherit eutils pam
 
 MY_P=${P/_rc/-rc}
 
-DESCRIPTION="The PAM SMB module, allows authentication against a SMB (such as the Win_x families) server"
+DESCRIPTION="PAM module for authenticating against an SMB (such as the Win_x families) server"
 HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
 SRC_URI="
 	mirror://samba/pam_smb/v2/${MY_P}.tar.gz
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
index 0cac116f3aad..9fdaecd291ea 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
@@ -7,7 +7,7 @@ inherit eutils pam
 
 MY_P=${P/_rc/-rc}
 
-DESCRIPTION="The PAM SMB module, allows authentication against a SMB (such as the Win_x families) server"
+DESCRIPTION="PAM module for authenticating against an SMB (such as the Win_x families) server"
 HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
 SRC_URI="
 	mirror://samba/pam_smb/v2/${MY_P}.tar.gz
diff --git a/sys-auth/thinkfinger/Manifest b/sys-auth/thinkfinger/Manifest
index 32c689afd7c2..380928e07a8f 100644
--- a/sys-auth/thinkfinger/Manifest
+++ b/sys-auth/thinkfinger/Manifest
@@ -5,5 +5,5 @@ AUX 0.3-strip-strip.patch 1375 BLAKE2B 2eedb83b3257b5b597d4c6989f6bb6d17527bd34b
 AUX 0.3-tftoolgroup.patch 1708 BLAKE2B c6cfddb352ca4202625c05dfcc0a44e0448f3ec225a4ed7d5c0dc26eabbdf5398ccf91e55e6a4009bbb290552eb6c6bcb402fa3dc86556f353b9fc7503c0504c SHA512 cf4d73bd3fa29b029074b4a529426f7822eeb356b4ee5d7ac503a55fb27e891c63ccd44a0e155b1ab0ec3b2c32ca23378648f9514653861761ed75ca797aeb9a
 AUX 60-thinkfinger.rules 251 BLAKE2B 1d9ed9c8186f3974e6953042ef7947bab0f688888eaef7526287af1ad198a465be1ddce56c9604e2c3177d404c396c1a4d213cfe34e1f6dee92af06f6185b3dc SHA512 076aa2c09498681952d92268f6b87137f6a7856447dfb00bdde36408fd54cdd1856566424595815068981df44c36592e26e2d61e2f220d8311373f1149b6ab4a
 DIST thinkfinger-0.3.tar.gz 372053 SHA256 9741ae205aadc9f576be73c382596266300e709371e72574a86e339ebf978f4b SHA512 08bbefd906047dd128c9a3d5eef4b14332e51383d9c0667974ffe7f85ccab2561310f58adfa0cfe8a65154e621a607542f6e99df9be3f21ced394bc7993db4ff WHIRLPOOL 3911ab0ef7d75004229b9c5b2c7a33253d017105c273c6fddf318a6de4e109bf83bb45533d42b5820669d8168bc58fdaaa7201aceb92c5ec6aa2427a65987ef0
-EBUILD thinkfinger-0.3-r3.ebuild 2032 BLAKE2B 3dc161ef8f4a9d4a6085b92c169ba98252008aaa19ea40c64a7d6dda8b93fadb66c7ce320c2ce6dd125b76b21106960991abc897b4f4872cef42b74c99608ece SHA512 db039efeecf66ac460f5f4903196b4853dfa1df168da5d6ced830a0a4b8173aa076bc22027a64de490cd161b46a40b3631f32d20665a18ca5429f98e709d3a2e
+EBUILD thinkfinger-0.3-r3.ebuild 2011 BLAKE2B aa92ecec35bbbe54e93cfff4dbf388789ee9bb550dfceb884b486a06cc93f488a1e5f2645c2f1cc2fe51cbe6a8928c142133578196d8c412b7e88696a88350b8 SHA512 bb9695d79f0a6759f4b7d25ffa98a88f83aa221b9a725136015d705477cc4cc0510eca49947ec4860047e1e201da3b76adc7629b645d13b42a7eb4345692a4a8
 MISC metadata.xml 362 BLAKE2B 355905ae0e91e21d4b9e48e97220621a558fda9aaf953b0788a08e9d44d2e8168f6667317ba29eea49703d5413e956835fe5968af59e861f4f1dc51b66f2c9d5 SHA512 14e0c9aa290bc41f61c7b9e12539ff56f80141884969ff08e63bf96d4baeed4bc726469f6969085fb124df0626532a4b8cb7fe52646db4fd89f627cfdc102d7f
diff --git a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
index ce297a26fdbe..69a097a8de84 100644
--- a/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
+++ b/sys-auth/thinkfinger/thinkfinger-0.3-r3.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit autotools-utils user linux-info pam
 
-DESCRIPTION="Support for the UPEK/SGS Thomson Microelectronics fingerprint reader, often seen in Thinkpads"
+DESCRIPTION="Support for the UPEK/SGS Thomson fingerprint reader, common in Thinkpads"
 HOMEPAGE="http://thinkfinger.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ebe4839eafb3..51802db79745 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/endpoint/Manifest b/sys-block/endpoint/Manifest
index 7a83f54a2b20..1ef74fb71f43 100644
--- a/sys-block/endpoint/Manifest
+++ b/sys-block/endpoint/Manifest
@@ -1,4 +1,4 @@
 AUX endpoint-0.1.0-errormessages.patch 1290 BLAKE2B 05fb5b2bdb72c09d0320cc0a457a04ce4950f68e15b561a285ccb1b4da0759c68cc56c86499f24d7ff5dcfdb8c92c08e348eca11a8a4e569ad4febce569cf38d SHA512 8ad7f22149112ac3f4deaa6609384c26799f38980d93818959f2cdeffe21303f361488e988e5137b119e0c3f3eab25da83f9d4fe293012c78821d080d9db5d58
 DIST endpoint-0.1.0.tar.gz 121954 SHA256 53831b97f831dabd5694364d06b8ad2f33d1e73ab03f6c57bea3ad96fa7f510a SHA512 9fbba37c3521a6b30327e65e40cbfbd4a0db7d8592b463e5fa4d6f200bb091bd7f659f13307c3d26312d39ace097942e251afd645570342a859f8699b8afee0c WHIRLPOOL a495a2d68769d1bb98e07388a9c3003987cfa24722b56d521fa15ede779bdd8c7d07108f9a1763b230ee2741bd68e957e238c6476969802b73258a5433148a5d
-EBUILD endpoint-0.1.0.ebuild 728 BLAKE2B 9fd3eb1937f813eb4b62e3c99ee39e66e6761208bd4527f2bf7b74eec0f8dcbadbb6a2d869fe064a53bb7625f03699a4d37a2a4c189e3a23ea05ccfd9118380b SHA512 68fe0dcb9b1dbddd0bf9f27ff99d2b48101b69ae49485bed73f84be2f49214cb640e2ae1d9d3785af9a782975893b66396d88a1cbefb9e85f1854feb2cfb0a65
+EBUILD endpoint-0.1.0.ebuild 717 BLAKE2B 550eca49fd19740a9871dffe7844342748fa197a76ea69533af93e4596ac272333cd0a52ff03cce0434fffa76e671057cc48702b472f3d9418585e25dd365319 SHA512 d6d105857080b7bcd3e6761eb2ce00c35b7d7fd734b54829a9d12d3b6781f81b741291814df0a1e770968ff81800358c004926713a093e89579c0a402df9e181
 MISC metadata.xml 580 BLAKE2B b5687c698c9c0c73b6be6d682560cb8a0c764bc6e539eefb8d755b54c26734ffdc18043cb46ffd087989d355cc223addbc564111f5358af20dbdf0435542c223 SHA512 b3c5bc8398cc7d640efdc510cfb4ab96ab59749da42204ce2840edd7a666c6ea7c95fb6357ce8115556c1629d09c4530d94e90a4f569a1fc6dc80cf8e8047890
diff --git a/sys-block/endpoint/endpoint-0.1.0.ebuild b/sys-block/endpoint/endpoint-0.1.0.ebuild
index 83701a18e979..431d4d19bb4e 100644
--- a/sys-block/endpoint/endpoint-0.1.0.ebuild
+++ b/sys-block/endpoint/endpoint-0.1.0.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils
 
-DESCRIPTION="Endpoint turns a Linux machine with one or more firewire cards into an SBP-2 device"
+DESCRIPTION="Endpoint turns a Linux machine with a firewire card into an SBP-2 device"
 HOMEPAGE="http://oss.oracle.com/projects/endpoint/"
 SRC_URI="http://oss.oracle.com/projects/endpoint/dist/files/${P}.tar.gz"
 
diff --git a/sys-block/hpacucli/Manifest b/sys-block/hpacucli/Manifest
index 027ee6e30731..8d1892e3bd2e 100644
--- a/sys-block/hpacucli/Manifest
+++ b/sys-block/hpacucli/Manifest
@@ -4,6 +4,6 @@ DIST hpacucli-9.30-15.0.i386.rpm 6405071 SHA256 f1019a4a26c7d9adef1761fafb46b3ad
 DIST hpacucli-9.30-15.0.x86_64.rpm 6367162 SHA256 d25b4fc593e11e00f2ca2b83417b23d1b1e12e6bff3afcda5333b274dea89901 SHA512 ad53b7452feffc7457220b9f1df8fd435637e7d1d61b42bdaffe75e62c8245a127b7a80435a40ac5675f0a64e14cc9a99fa556dbecb0e37ae70dda51927afd6e WHIRLPOOL 0ba12328989bd5dce8eb5d83377768605f931ca78dd0e534bdbf65c93a17536499a7a9ea77816f4640ec86be8bdb620ae578fa14f7f7542c18ef95ac6efa3d27
 DIST hpacucli-9.40-12.0.i386.rpm 6824495 SHA256 bc0078f6e2f8e64eb5e3ce26527e08134669ca507a84c36bbe4266ac3685fa9e SHA512 93ae6c170e14e187ce33522a7f7d4e0970f8443758aa76f4eb72c6b818eeeff7720e9869473b62e4b088ced0bb9a198afecf7ff62da2fc73e67208f5cc680158 WHIRLPOOL 7c5942fb85a778c79ea78343602ccd35d2fb5a271ff17164ab157e59ad6fb8aacaa9b6d4fa122a7537bf43d54ea314491f0cc91b99681ca51581b8942a18b96c
 DIST hpacucli-9.40-12.0.x86_64.rpm 6800521 SHA256 94c51105fed0a34e2a8896720ce8234af23fcffb11f0a6b7e56eb30c6e803cb8 SHA512 a7de22febc0261bdb60a5fee250d42455dc0ac152541f34eb91df81b4e57472ae96ee2972e3a4c44ff409e3d1c2b364054818c7ea610c3b2a20c913a51df2ed4 WHIRLPOOL 7d9c55d10a3953b6152e2b1937817ed8b129948229bfd4bf87f7fbd9dddece0d786fe390ca6ccc9cfd4356c91ee62484484e2dc153050365a324e3c54853c939
-EBUILD hpacucli-9.30.15.0.ebuild 1623 BLAKE2B 198a251bccf7b864f3d5bde71f8a320bca58363e42d467490979ed72aff5649c3cca3aab7cf6702f8f084425ef5e0dc537bd610d93b4d5f84ba07e089dd76edf SHA512 bee8494e334c68dbedf9b56068b2c1391c21f2a518697ff75a3eaa89fdc14efc5819328dd3b2eb03a560c80ee4d7ba715dce78d663ea20c3bc6e80e1f872d538
-EBUILD hpacucli-9.40.12.0.ebuild 1526 BLAKE2B 0cd96ce2d9ed554edcfd297ffcebd29226a82335c74cc73e684cde7fa0fae9bb2ff992404fa10575f39cae13a985e21c74a675355b4c35bb572aca642fb253cd SHA512 5a1ba2d4e635abde2bd27f9ac8f27dd1d4bc21df25cc37546627f031c086ad70c0d6d8b7cada4895181153c1bae3572f8a0bc7cd88a6e5b624788aedfa288569
+EBUILD hpacucli-9.30.15.0.ebuild 1616 BLAKE2B c5820c25726f37c2ef47ab8cb7adbd8ee0a812f67e5b73262afde60fff6c76755303f2f17ee06052f9ed47395db1db33f71c9b0f22bfb08f64330909bcf57c78 SHA512 43c0430168234e0897fe10fba569d262804c6955f02f1f5d6a29140c265a49937913b76aec1e1fd4801a04736184f576f49ae7d3c065b6450671915b3111113d
+EBUILD hpacucli-9.40.12.0.ebuild 1519 BLAKE2B 9ca3161328ac758e428f305cd59cefa6fe1380337e69af8233885fda07c7613c90fbd19e3a913f13b3b3ea92238c050bc1275d81314cc5f7bfa5984f7b9f6150 SHA512 872f452a28257771ca073c849cfc9e81e1d9b1968fed35be90f59245a04af343379991a25745ab74504e21b5e2b8495dfa9061f29ab3a54d246bf586079e2435
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild b/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
index d07b296b3ed6..4310bd4048cc 100644
--- a/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
+++ b/sys-block/hpacucli/hpacucli-9.30.15.0.ebuild
@@ -13,7 +13,7 @@ AMD64_VID="77370"
 X86_PID="414707558"
 X86_VID="77371"
 
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
+DESCRIPTION="HP Array Config Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
 HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
 SRC_URI="
 	amd64? ( ${SRC_URI_BASE}/p${AMD64_PID}/v${AMD64_VID}/${PN}-${MY_PV}.x86_64.rpm )
diff --git a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
index 3420767da1c3..c2418f407ee1 100644
--- a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
+++ b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
@@ -13,7 +13,7 @@ AMD64_VID="80070"
 X86_PID="414707558"
 X86_VID="80071"
 
-DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
+DESCRIPTION="HP Array Config Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
 HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
 SRC_URI="
 	amd64? ( ${SRC_URI_BASE}/p${AMD64_PID}/v${AMD64_VID}/${PN}-${MY_PV}.x86_64.rpm )
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 23affe3b339d..8717b29676d0 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -20,12 +20,12 @@ AUX open-iscsi-2.0.874-musl-fixes.patch 1478 BLAKE2B a58a8eec59c7dd05e121ab8213d
 DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
 DIST open-iscsi-2.0-873.tar.gz 667069 SHA256 7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9 SHA512 4e67116cb7dd49381c9279645e5a661f05596ae6be3b832772089828b3764ca2d04b5dea1bcc337071efb52c3c75a6fb943136c659ee59500f3a198ed0dcea6b WHIRLPOOL 05af106f11da9f9f02c10edd5412d0f99816349e06e192059700eb1ae24a36027c3f0d7ed423aa7bb1c0b9d8b3aa1b6aa72a2aadb00f27762edf16b7f7d08c09
 DIST open-iscsi-2.0.874.tar.gz 625039 SHA256 d0071bf00fdf6591cd6ea5caf89fa57ada03d263da1f80f17deff76acf7419e1 SHA512 66d8a52b6401229d51873f1ee0f4e7259a8ed584800403a41741c7eeedc0ec21a2b116671cb7259f60918d083ffb46d76860236a1b10fbb94a4c1d61bddae1ae WHIRLPOOL 488aea5551a299bbb15118efc52d7c228836e9cc7973a99ee4b8dfcfea4b7b14e86791e65230d25c244b6b5fe8ffaf1ae3df01f5a7b223b93c15aeb035a12852
-EBUILD open-iscsi-2.0.872-r2.ebuild 3007 BLAKE2B a6017c3814361d509bc7ef742728eff4eb5380b2a597cb6cf68db0798e63e6452890169a0e46e94d358ce96b8be2e6f7a733731dbbfb7fbd6b74e6ad8a952cdb SHA512 d3b56940d8ac3cb2697a934b544302bb0e93cfead3aa69df173a0643fbc121e3c5316e27f6ae8935f6a1730ed687011eda7d8915ef3395d2c56691145f370c62
-EBUILD open-iscsi-2.0.872-r3.ebuild 3183 BLAKE2B ecbee6869e888d4f8b514ad35cd48e7dbf51e1af2e8634c34977110bcef4525af0024dfc7963550464998d85d9f3e4e301a762ec43a4ec6a033f93365f0cee35 SHA512 080d46776411e08a3a2eb8317f5354ba93af5b13e879e541257395c961abce591d5424e97fe44f0c2efa7c930e9aee31a7a79cd940170272a0b37345831f1ac4
-EBUILD open-iscsi-2.0.873-r1.ebuild 2565 BLAKE2B b816b9a736a70eb231e5cdd72aa02f57ad320d4abeca03b44d78478abfe9ac01d522f553c7ddc36da5d8d053b7b1827eb846725950f1037d34213d00eb759290 SHA512 ee202d73255f732248336eec427a0102b857267222d3eaf7b0545f93be2ce15b63b3bbd57fae7ed83050581ce6ac2cac9d16cfbe5a989d1a18812d104dc7133b
-EBUILD open-iscsi-2.0.873-r2.ebuild 3271 BLAKE2B 9e26e8427aee8fc94c7e34d9791ac61febe3ab69a7ff9d8ce12610f565592792e145758bbc8b7cc3998fc310f4db7fe8e545786e45f8b2da2421b871a8743007 SHA512 ae7db0924daaf6013d9745222fbc308815dbf6f06978310fa7f9a6eed203cc612e7ee0bb5bc5b642cb5b138fe281e711836dcf8e7bff13d3a068d93f3ce4c2ad
-EBUILD open-iscsi-2.0.873-r3.ebuild 3324 BLAKE2B e2d02d916f3ebd78cd75c35a42722b01769887aff0f6cb7f368abd4110e48bbd552353d2ad2ed545df8dc78d12a15cf6cc40e80e393b5639b43c2caf2de3f783 SHA512 f3154556865d0611bf7452f1d2f359a4edcb717dde5d60898d1f0b58be7901b77b240bb931c87a56c93257410a9bf5dbe81e2aef1e75eb73f5212ddd7da4e1b7
-EBUILD open-iscsi-2.0.873.ebuild 2367 BLAKE2B 9766e6d894b323976cf5533a52949f1357239ce723a8d8873e2869dad4aa1aef786797ab906240f553c4810f29560a2c38ca406378230a917744f9a669a63ebe SHA512 e70c63d139fd7d2e904152b89b1353d8c7e66abfae4caacc326ffc4ad226c5319ecdd175b2854022062d2f4e011ca4011c7c0343cd85a2dfd4e4d0a175756d02
+EBUILD open-iscsi-2.0.872-r2.ebuild 2987 BLAKE2B 9de1e02c0f2373cdcfb333d8e944f6329dba97fabafbd41ad375519e5c10f9d9d47d58053616caf098b27ec220dc5098a2d0ee39ed33878d1bc89c00e66db280 SHA512 4572c1e2d0cf162d414d3c3771acabaf25f2057d7c25853adf5cc61106a59c86e9d3241690af477ab78023b3af3d1ee5d311ce88a21e7274accc169daf45e41e
+EBUILD open-iscsi-2.0.872-r3.ebuild 3163 BLAKE2B 37fc57e2fe93d99c8c863092d63fcc372899f519a9001b3fff3d24350e502ba100811f316c841a3d2e0a00250ec65219af6efcd40167bb08c7dda35984f395a5 SHA512 611cad8dca44eba6c5d512bad51b6018e3c6ab9b1a187c96f56957ab047789b53e9f4ec211b5a6fc6d8c08615812a03b95ed98d80505156952236e7a4a67c4c1
+EBUILD open-iscsi-2.0.873-r1.ebuild 2545 BLAKE2B c6b89937392718933e75616429acab05e7be548457b9aadaa1be77863dc8ed66e3acbaf482a320479b9c7f73507425615af86839209e2e956e08a12061097a41 SHA512 11de4116925ebe35a63ee19bb49a87bccff3c2648f3ea94ea05726d48cb0fe950a3aae9420b697c51f9f1387cea9075dfbffbeae7ca20af1e411769c34610339
+EBUILD open-iscsi-2.0.873-r2.ebuild 3251 BLAKE2B 795d8c65c1cd02f4d891750809f51dd3ef876e11caa382b7cee606bd624e511bfcc1ecd97875aebd9ce03d4d08859832bdfadc0e675e28444df26231407f7ece SHA512 476a6b0bdbfd789292bebb31ca4e9b594268fcd9a77924e1c885afe651880336755c62ac1dcc953eeda889c69d7bbfe85c88687d2356b238d0680de6ae367613
+EBUILD open-iscsi-2.0.873-r3.ebuild 3304 BLAKE2B 9cf11c61e50fca885d59bfd625db48f483d89ee7d1a0fe2eaeece59e6d4b56cf4bcfe092ca1e36c70371e9e1b58c178adb25a2ddd545554831714a56625a4f7f SHA512 14c3afdf5b5ed0f2b315fc2908c5e8886433669cef7e3f0f67eede9e01313cae47f0a71e78b4ba78404e48cd02359b543c9d644852f0c380146c77cddc44cd52
+EBUILD open-iscsi-2.0.873.ebuild 2347 BLAKE2B 1e9a9726dce22fec8219c321fc0e65749a528a8ae938c4ea52cdf17dc5c852278b346bbb8bf605c3cda89e0d09bdfc9e17498bb44bafd9f7993fe61c4d7a9cb5 SHA512 3e7d598c2db4a0d47814377d396722e95b906400d8de9d2a15a531a062f680575cf9a8eb1556c4cba4d342b3e4365ccf1f5ec76512c899b5726a8013bf43add9
 EBUILD open-iscsi-2.0.874-r1.ebuild 3629 BLAKE2B 53330a69aee8fd137f5d09965e86f21deec97f5cd1ba6168b4d50eb47cf13e2d8e2493707110191d3d7c91d38720a5b1666e32bbc0686a9e8f4db09936638d18 SHA512 f9dbe5b16a4580351f424c98dafde5e83e99bda84d2d389b96b34f772a757097195adb183df2030a8b15da752ac449c2588fbb11a4fb9cfb7095a4fa31b7ab00
 EBUILD open-iscsi-2.0.874.ebuild 3164 BLAKE2B 3a001be2ab05943a7614f35e39da4286751cece5e2b7832799211fc1a33c81b437e22ba64269f46a19e38ae80a11993b2e0d5d7d7beb036acf1ce02139cb0b5e SHA512 19219e336d2e289dfa0d2b1e28d8b7d1274f734fd6cd55be1512254412a2688122fc1fe6137d4050cb62160981a358366184c668369212103d28fcdaa1305278
 MISC metadata.xml 458 BLAKE2B 34a2a9b03797454b48ace319f383d85da5f9fe0f14afa1f1da1dc9afc535a2e1aeddaea0df27811b77fd3099b5754ee0755d49491157ed1e141fc2078c258389 SHA512 bd5e104acd3e07b8965b4eacb7b397b75448fc31b7359f17ee4e24af18fcd00ecd0c64001d42b7a542790151678b9dd02bad9513a69986c60cf91cceebfe86c3
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
index 33add91a2b45..e56b51bec426 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
index fc5ff0ea8915..4e5854c5f89b 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.872-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=2
 inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 MY_PV="${PN}-$(replace_version_separator 2 "-" $MY_PV)"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_PV}.tar.gz"
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
index db8bd4e65fa2..f69cf9616609 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r1.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
index d1b340ee2b7a..4ea93fca3377 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r2.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
index 3902a0021654..72734745c811 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873-r3.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic toolchain-funcs udev
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
 
diff --git a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
index 7311e4328e68..9e1610b73956 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.873.ebuild
@@ -7,7 +7,7 @@ inherit versionator linux-info eutils flag-o-matic toolchain-funcs
 
 MY_P="${PN}-$(replace_version_separator 2 "-")"
 
-DESCRIPTION="Open-iSCSI is a high performance, transport independent, multi-platform implementation of RFC3720"
+DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
 HOMEPAGE="http://www.open-iscsi.com/"
 SRC_URI="http://www.open-iscsi.org/bits/${MY_P}.tar.gz"
 
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 573e8af7d04e..23c7575d3a7c 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -7,5 +7,5 @@ AUX partimaged.pam 266 BLAKE2B d46ffadffba0635c4fce9612e4bdd187aa5e17b823d747d8b
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 SHA256 753a6c81f4be18033faed365320dc540fe5e58183eaadcd7a5b69b096fec6635 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9 WHIRLPOOL a4e30ea6240c89b568fd5959f4d72130e3737a409270d9336e45f2c4f85c2e6c1c66b5b60abdf47aa238ec4159010cbbcc75c02c6e5a1cb309e2fceee1df7750
-EBUILD partimage-0.6.9.ebuild 3448 BLAKE2B 5131bd44bbd2d796b197e56f631dc1b8f26e956c7ceb835cf03549aaf4b841816a022e3e425d9c1d7f6dceaef9464c38a1b7ec8b3730723c559ce49ccabeabb8 SHA512 3633ffc3970121daae9594508c3efa5a6b44bf40f01ea5565ba87d763d2adc98921151c4ef12c121ea519eb9d0f10975a2d6901f038b6692d120371b0f66fa17
+EBUILD partimage-0.6.9.ebuild 3445 BLAKE2B f90a263110eba0d69d7d21a643ba6eee353d49624ceeddd50b605ad7cee19a6fbcdfb2fc67ee3e41ce67685243f215df93221157e7e53d953cd6ea1a5a813e1b SHA512 c48ec114f05b868bf525234aa7ef9011efa4e61343123e56a8012cadf548968ad805bbe8658c4e02fa36201bbe3ce462e1ab550c4b5eb09cd071b7c2112c5563
 MISC metadata.xml 427 BLAKE2B 33870f2fc393bed75dcdbda1bb16d6cc947cfa4f7321e7f219338cab014be901eca6d3e2dc11c0ecd50be28922f0f1a746a8756c3d860d8f10549098c3479cad SHA512 e5e5377e9f6cf6337b93ea8609424ce4b9514b0b0d9628ef22999537af616f24e4882a915cf6249f8d0e721b5e25e0a50f5e046b8ac9991c130b4f5892298e67
diff --git a/sys-block/partimage/partimage-0.6.9.ebuild b/sys-block/partimage/partimage-0.6.9.ebuild
index fea44be61e02..f0969dd38cbf 100644
--- a/sys-block/partimage/partimage-0.6.9.ebuild
+++ b/sys-block/partimage/partimage-0.6.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 inherit eutils flag-o-matic pam user
 
-DESCRIPTION="Console-based application to efficiently save raw partition data to an image file"
+DESCRIPTION="Console-based application to efficiently save raw partition data to image file"
 HOMEPAGE="http://www.partimage.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2c4996acd5d0..7bfe1d524bbf 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
new file mode 100644
index 000000000000..07d8b3245f05
--- /dev/null
+++ b/sys-cluster/charliecloud/Manifest
@@ -0,0 +1,4 @@
+DIST charliecloud-0.2.3_pre20171121.tar.gz 82636 BLAKE2B 6eb8465da39dc628d8cf65b475263b6ff12757fec00ede16025c126bc861ab07969fb8a815fbdfa48424911905d59e1290f6281a8d804d069cf940b7a0e66b47 SHA512 1828651d18cd8246e0d462fa966052be21a18f0a7a6bdb76040740dd97b271723c317ed764296cf2d0e554cec527612a02e733ec7bf3e6f4ac73139fed968c83
+EBUILD charliecloud-0.2.3_pre20171121.ebuild 1802 BLAKE2B ed9e88d7923b3a871109c378e50c822236f62ef343ce7881be3c3cb58f0635c9bad41c44857a79722ad12190c6d3c95a76eb25771b47d406a75cc976c033e6ed SHA512 df7e51cd6bced3ccd80ce405c210e6ac338afb983f767ea437a07242cf31922391149a07df8df9d00dee2d283ae3a75fac92341380e1561a4727f72b8f83db75
+EBUILD charliecloud-9999.ebuild 1709 BLAKE2B 57976a5aa46b34ec25532421f010caabe241ea145559606b01abb701a92b61e01ad1e30bf0f543c922827202f280c47b2a6c7651a5879fa399e5c3acf839754f SHA512 cb5039a397b21106592df5ec8dc4a3d57fdd83c9e553e93346bd7bd276765fdeb81bcb6307853db7003742259bea8ca0983f798c95927f91360e534e6da51d94
+MISC metadata.xml 535 BLAKE2B 06e21948e2527522df26ce8bd627e74c5d1518d2e382a03affe1a046c1e07ded0e6f4c7dfd614512c638227e0313cd90ea9fdb49f13a649ba9b33f9bd6b37ead SHA512 26ecdf060781cd075aba4dfd509d93ceb968b5a21a4c11299a9f7ba977d5e8b80dda24a0fc246fdb8e2fe2c0da321ac8d2334ff284c7f738abdfb27f1afdc2bc
diff --git a/sys-cluster/charliecloud/charliecloud-0.2.3_pre20171121.ebuild b/sys-cluster/charliecloud/charliecloud-0.2.3_pre20171121.ebuild
new file mode 100644
index 000000000000..6a0def5177e2
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.2.3_pre20171121.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# User namespaces don't play well with the sandbox.
+RESTRICT="test"
+
+# Commit date: 21 Nov. 2017
+COMMIT="3eb9e3edfbcd61257bb52a361cf01782fcf15b5d"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples suid test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx
+	       dev-python/sphinx_rtd_theme
+	       net-misc/rsync )
+	test? ( app-arch/pigz )"
+
+src_compile() {
+	if use suid; then
+		export SETUID=1
+	fi
+	emake
+	if use doc && ! use suid; then
+		emake -C doc-src
+	fi
+}
+
+src_install() {
+	if use suid; then
+		export SETUID=1
+	fi
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
+	dodoc README.rst COPYRIGHT
+	if use doc && ! use suid; then
+		if ! use suid; then
+			mv doc html || die
+			dodoc -r html
+		else
+			ewarn "Building documentation with SUID not supported yet!"
+		fi
+	fi
+	if use examples; then
+		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+}
+
+src_test() {
+	cd "${S}/test" || die
+	export CH_TEST_TARDIR="${T}/tarballs"
+	export CH_TEST_IMGDIR="${T}/images"
+
+	# Do not run tests requiring root.
+	export CH_TEST_PERMDIRS="skip"
+	export CH_TEST_SKIP_DOCKER=yes
+	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
+
+	emake test-quick
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
new file mode 100644
index 000000000000..31d3d0f93db0
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# User namespaces don't play well with the sandbox.
+RESTRICT="test"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples suid test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx
+	       dev-python/sphinx_rtd_theme
+	       net-misc/rsync )
+	test? ( app-arch/pigz )"
+
+src_compile() {
+	if use suid; then
+		export SETUID=1
+	fi
+	emake
+	if use doc && ! use suid; then
+		emake -C doc-src
+	fi
+}
+
+src_install() {
+	if use suid; then
+		export SETUID=1
+	fi
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
+	dodoc README.rst COPYRIGHT
+	if use doc && ! use suid; then
+		if ! use suid; then
+			mv doc html || die
+			dodoc -r html
+		else
+			ewarn "Building documentation with SUID not supported yet!"
+		fi
+	fi
+	if use examples; then
+		docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	rm -rf "${ED}/usr/share/doc/charliecloud" || die
+}
+
+src_test() {
+	cd "${S}/test" || die
+	export CH_TEST_TARDIR="${T}/tarballs"
+	export CH_TEST_IMGDIR="${T}/images"
+
+	# Do not run tests requiring root.
+	export CH_TEST_PERMDIRS="skip"
+	export CH_TEST_SKIP_DOCKER=yes
+	sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
+
+	emake test-quick
+}
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
new file mode 100644
index 000000000000..717eef3ca7a4
--- /dev/null
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>o.freyermuth@googlemail.com</email>
+    <name>Oliver Freyermuth</name>
+    <description>Proxy-maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hpc/charliecloud</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-cluster/feedbackd-agent/Manifest b/sys-cluster/feedbackd-agent/Manifest
index e5db17af208a..b59dded6f49e 100644
--- a/sys-cluster/feedbackd-agent/Manifest
+++ b/sys-cluster/feedbackd-agent/Manifest
@@ -1,4 +1,4 @@
 AUX feedbackd-agent-0.4-asneeded.patch 1079 BLAKE2B 685e53aae155ab5fe83e459b0480931ca7b384605ee73a7aea33c612c77021bee1655bba27360404e8ddd7057b68f608ff89a95391a7da05208477dd8fab9732 SHA512 957a197678eb6ac99e16d655987e1f5c18a28604c5252f3ff248548f7025aded50891e90cd126b4786d81a79ef6a1de915e2e7f28df2c98e9340cc718241b302
 DIST feedbackd-agent-0.4.tar.gz 69078 SHA256 0e1cf74d26387e5ce2591f29b92a19dfcd29b005585d363baa717c03705e49c8 SHA512 e7bdb3f547d59d63fff8c55b4bfd6229dd60c9183694d9f68ac899fcf3a3de47fc05473b514f8c13ea921bf619bf09f242c337245a78eb1a9de03e938069e380 WHIRLPOOL 50c0e401a01ad677f3bca278bed6e9542c4b257cd380981c547fc57cf90f96fce441b3d074202dd4fc60f49eae08137ac225125d42d618b2bc068fd9f63941fc
-EBUILD feedbackd-agent-0.4.ebuild 812 BLAKE2B 3c933b0bc2832a9463d645697930851e34bf4dd067dc5b7dfaf168f494bb7349a902a42c9a35d44d2583b433648ed5379d45b6a1e2533ca32508ed153cfcf2e4 SHA512 d93766d568e3d774bcc0ddd9e32de6f5c0979817898f3818a7bea56738b7643f1a0460d7bfcbaa8fe411eb87b260c57bf030fc5846ba41633570057a6e5143e8
+EBUILD feedbackd-agent-0.4.ebuild 801 BLAKE2B 342ce3a4bc09ae54449e10a869e6b62660ba3dbdd4c7b36206db919d20f7303314b5356507c7fe3160dc2231910b863e029426fed4fc8e7ba092e91a3f17f9ae SHA512 ec050f40578d8589d97d4924554e1ec8084515a925c0b6c18689a6381ff33d982927a2f8c94da77bbe4436875419a93f8802f5c4c119e8abaeeb51500c6e516f
 MISC metadata.xml 336 BLAKE2B dbf9a81fc25b7ce54158e0f47fcf9014558bc292d2a0e951320490eb4be75421afebb067750f541c8172a37d55ff3f86a1cf64366d8172e8ecfeeb3728568903 SHA512 bb519790cc800117748b4968cecd1a99e395a23731b3bc20c481b84f8ed8b46a293a50b1724c68cd6573345db097a919b348c685e74d0da3bed80c7b72c4a76f
diff --git a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
index d5947540f5bd..b2a6acd7231d 100644
--- a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
+++ b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
@@ -3,7 +3,7 @@
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="system for dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster"
+DESCRIPTION="Dynamic feedback of server loads in a Linux Virtual Server (LVS)-based cluster"
 HOMEPAGE="http://ozlabs.org/~jk/projects/feedbackd/"
 SRC_URI="mirror://sourceforge/feedbackd/${P}.tar.gz"
 
diff --git a/sys-cluster/hpl/Manifest b/sys-cluster/hpl/Manifest
index 40675c9006d9..f3a27d333668 100644
--- a/sys-cluster/hpl/Manifest
+++ b/sys-cluster/hpl/Manifest
@@ -1,3 +1,3 @@
 DIST hpl-2.0.tar.gz 591087 SHA256 d8d118c310d34a5a2acf5a689270a9f7bea60245552d24af8641599651909bec SHA512 3aa76144526b01ec40d940cae50d47e480e2760a36d1e95bc6e431b216407db190946fc3d99a6a7caf7b61bcc76d805d28da3ef0b141ff467854e1cdf10bb274 WHIRLPOOL 79da0950089d8e7d6128a2af7a44de704c2666aeb74de08e9e0a06fc23f8c4d17da2ab5107b5f6a82ca073800ec2af4f003c7792ae84e1ec032d9572e78bc0b2
-EBUILD hpl-2.0-r3.ebuild 1870 BLAKE2B 01d169f8bd5ad3071b30c8fe7ac735e322532d329bb27125b81d44232647d0745e2b86b779e54ecb3c88a9c29452aaf1f9344c859d9faefbcea0d8332ed5f681 SHA512 397e2ebd6fd10089cc070dbd385fdb60364280e1c1447fab0022c300bb1d46ce9ab661582b7f4d2e16c2c3553006c8309112fed693c3cbf5f78c98afdd9dd6f3
+EBUILD hpl-2.0-r3.ebuild 1850 BLAKE2B 8216b10ee951bbc22d9c73e4dc29942ac0206931fd17b8784a1c9b3b33af6389ea309cbfc093a182dc04ae22a870438b602b847ece6e81b178ae02464fa0e474 SHA512 14521f5ac2f74dd8cb8a744bc29d23749d7575e5a7b4924f506a54afb0d87ef71bbbb6837c6e082bf470411e6e084993bec15ec51c26e634ac9bb6c8d83912d4
 MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r3.ebuild
index 61cbba4afc7d..8f94c4548d43 100644
--- a/sys-cluster/hpl/hpl-2.0-r3.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 
 inherit eutils multilib
 
-DESCRIPTION="A Portable Implementation of the High-Performance Linpack Benchmark for Distributed-Memory Computers"
+DESCRIPTION="Portable Implementation of the Linpack Benchmark for Distributed-Memory Clusters"
 HOMEPAGE="http://www.netlib.org/benchmark/hpl/"
 SRC_URI="http://www.netlib.org/benchmark/hpl/hpl-${PV}.tar.gz"
 
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index d2144b0361f9..2724dfab4bb4 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1,5 +1,5 @@
 DIST libcircle-0.2.0_rc1.tar.gz 351901 SHA256 59ed75c0bdf2b24f96fbc0230848a5aab57d4eab5a68895489d59a7f68ddd2ee SHA512 1ce07ae012c281fe3e6fbae29bf48e1079768ed5f92f9375c3be02880bed1b1feee6630b31560d7129f76640990e94da1753f55b11a0a8977adaaf9e51144044 WHIRLPOOL 984713d28ee80f686daea7d419a1135360bcda542f904a1aa4ea0ef03b87482e60c2c0858a9e6fd85d7bde1ef557bd61c717ba924f942dfd82d7cbeb9a2e0359
 DIST libcircle-0.2.1_rc1.tar.gz 354251 SHA256 a0d0d75db2be9e47045572ad40f7e1077b7c3540f79180ad1db265ca89438db3 SHA512 9a125bc9f95b1dfb1c777dece4310a709cec46f820651216cd3a34486260f80221e564b82dfaf1ba58b8091b18c6d6b87b0c64d24a940cae6593dc144426fb54 WHIRLPOOL ec77f629c8d5b2391a8f25aa888e0606a0d0240ccf86e6bbe5ba8a04c5e411a6d3f077777da6cdd7badaa87c40b44b6a67b7b901ceb94fb3bec3b118b8465a0a
-EBUILD libcircle-0.2.0_rc1.ebuild 939 BLAKE2B 65f930dbde4958c9417d5f4e66fa5f2b52985b1bf66554e621d493c7c1cd410d9d669483c2a2c67d43144ff85f6a0e76dbbcf62232ae06ff1067d1080b05598e SHA512 794df2fdd09ed17cc9d9c67a279563f49f123db14b4d1a7b33ab47f1155d60daaa7eb8f673c7631debcaab05591af1307a492e7e46325173cfa351789cf0d8a2
-EBUILD libcircle-0.2.1_rc1.ebuild 939 BLAKE2B 65f930dbde4958c9417d5f4e66fa5f2b52985b1bf66554e621d493c7c1cd410d9d669483c2a2c67d43144ff85f6a0e76dbbcf62232ae06ff1067d1080b05598e SHA512 794df2fdd09ed17cc9d9c67a279563f49f123db14b4d1a7b33ab47f1155d60daaa7eb8f673c7631debcaab05591af1307a492e7e46325173cfa351789cf0d8a2
+EBUILD libcircle-0.2.0_rc1.ebuild 936 BLAKE2B 660206cfc2d245ee82268f65f2cf3aaf5fa0e1d7f1c5a0744fcca1725404d811bba7c7833dc84a5a6bd791639610ada17997906700f6ff168ad6b094b033742e SHA512 f9536b96b1b894e4434b862bfc73815552ed0aa9d19406193668ceeb2867bcca1c6210d3b8fc00846f5c02a6f8d2ab31dea94e00f2652cd9616630958cbe53d6
+EBUILD libcircle-0.2.1_rc1.ebuild 936 BLAKE2B 660206cfc2d245ee82268f65f2cf3aaf5fa0e1d7f1c5a0744fcca1725404d811bba7c7833dc84a5a6bd791639610ada17997906700f6ff168ad6b094b033742e SHA512 f9536b96b1b894e4434b862bfc73815552ed0aa9d19406193668ceeb2867bcca1c6210d3b8fc00846f5c02a6f8d2ab31dea94e00f2652cd9616630958cbe53d6
 MISC metadata.xml 449 BLAKE2B b43eb6e775467347922b26b774c604ad8e2288069aa47fdebb64a9d3ceb58587ffb29f6e66ac92094a2bbf972ffb6b3675b3ab86dd7849d6275a517a3281d16d SHA512 99123cb30ea2d364d8df6997ee9f6498665bc2747f98dcae29a22b477cb6ccaa51aeb27f0e2f405fcc4bce9c810c2230bfc540d04abb520793430a11686dbaff
diff --git a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
index 8093e3eee7b1..de01f31fa088 100644
--- a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
-DESCRIPTION="an API for distributing embarrassingly parallel workloads using self-stabilization"
+DESCRIPTION="API for distributing embarrassingly parallel workloads using self-stabilization"
 HOMEPAGE="https://github.com/hpc/libcircle"
 
 SLOT="0"
diff --git a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
index 8093e3eee7b1..de01f31fa088 100644
--- a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
-DESCRIPTION="an API for distributing embarrassingly parallel workloads using self-stabilization"
+DESCRIPTION="API for distributing embarrassingly parallel workloads using self-stabilization"
 HOMEPAGE="https://github.com/hpc/libcircle"
 
 SLOT="0"
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index b19e650c5b83..4dd8d4384086 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,5 +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 BLAKE2B 906f333d09dd891e45f2483657cdfface4e2e6c9c751b7bd9c672be9c22ccc38f06a1641c0266d7a88c2b209eaadcefa9c84650dcd83e99c417859cddb4fc2c5 SHA512 38875170f6d33d604a48d51384fbf3a82641779513ce44167ad9f9165758040c85fabbbbb70a83ad07d4de262213585df6f9b38d3600a7b20ed6bcaa0e7bcde6
+DIST minikube-0.23.0.tar.gz 19015892 BLAKE2B 24c35372a14eecbc1eaced0ff0f9e55e60246c709c0983faf226f558b7e2175002998cc0b455ac48b019f9e366a82fe65043dc2daee1eae8a01d3cf04cb8c4f4 SHA512 c89c633b6edf5dcabdc60e6c361b16934c47ee141b49d48192b7f5167e5612a7a7d44d79cf595161ac44826f8053051ace5300cdf64c710bd2c3b4247c159522
+DIST minikube-0.24.1.tar.gz 19029537 BLAKE2B 09e179297e3b1b4691d6e865be3e8a989b695fd46badbb488fbaaf33c4fabec8daafcdf7e0b28e140f4648e0109a98cc8744e932c69337102508c28dcbe30e05 SHA512 5f9bf0a7898ff2a074d35885a1ec55f7d23b45751ccf5532616c21eca1adee84fdedbd3971b673628d09a34659296a84fd78655b983411038a6b7e22ab608116
 EBUILD minikube-0.23.0.ebuild 1236 BLAKE2B 4616683a376b18613b3e5e43de0c2d2ce20c8d79de087f6f11e90358722b1ba7d5818e55f3987d2593c3fdbeec354121202877fba3c6a22073ad70a17d9065f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599
+EBUILD minikube-0.24.1.ebuild 1236 BLAKE2B 4616683a376b18613b3e5e43de0c2d2ce20c8d79de087f6f11e90358722b1ba7d5818e55f3987d2593c3fdbeec354121202877fba3c6a22073ad70a17d9065f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599
 MISC metadata.xml 329 BLAKE2B bee02eda560e62d3acfec815f602b025d2954be0e51e9d03866de095999db40208a582d8e135bb7403d6dc474f07a08c2a742d083606d6e11ff405af5b627030 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857
diff --git a/sys-cluster/minikube/minikube-0.22.3.ebuild b/sys-cluster/minikube/minikube-0.24.1.ebuild
index 1ba40d2ac399..a345c984a945 100644
--- a/sys-cluster/minikube/minikube-0.22.3.ebuild
+++ b/sys-cluster/minikube/minikube-0.24.1.ebuild
@@ -37,7 +37,7 @@ src_compile() {
 
 src_install() {
 	pushd src/${EGO_PN} || die
-	dobin out/minikube out/localkube
+	dobin out/minikube
 	dodoc -r docs CHANGELOG.md README.md
 	popd || die
 }
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 4aec7b2e869e..d63ec68a7372 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 067e7c235581..96b920bb6d4b 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,8 +1,8 @@
 AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb678d6759f9ac3a695d2e01d38b942a426a024f2e3023d4c67b3c7b40f1c968a9b066573da99823c0bccbcfbf6e SHA512 3a1f354b8979586b39e6e3f93f2df7d38c2f221fb00ceef7db6cb6b51712c0fc27dbbd75635a8e4e9e2f8f100c5a39cdc1d4c1cfc32bd6c406af94edef37e40d
 AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae
-DIST bc-1.06.95.tar.bz2 290069 SHA256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1 WHIRLPOOL e91adb7b1fd42c4d47dad76f994c51ee7a8d962a24cb1b0cbeaa992fe1be59878016d5883506ec4153293daf48fbe3f345bb88fbe3f6276b3353c89573a612af
-DIST bc-1.07.1.tar.gz 419850 SHA256 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34 WHIRLPOOL 87a9c0a5b7b2af082d59002147cd05cef7612a66f83ca688e6572ed2bbbdddcec945e7b8a0ee6e865f0142d31801ee3167b7eff023be8054d897d755bd282a2d
-EBUILD bc-1.06.95-r1.ebuild 1480 BLAKE2B 3a3ba34d0b5c14cb9a0be8cf8f9578805626482af3e27ef6b3839cb465d3d66cfc0bd788b9e19296899cf0da631ac116fab1aee1189c1f7981407e9f2424fdf1 SHA512 fc39ebb2f8e6e13c48856e8434951b25847883720f409a52b46e0e9a4c231bc896cd2ef280c042b9d5968fce62e2a007e39defa66a56acc26070ecf8bd2e439c
-EBUILD bc-1.06.95-r2.ebuild 1588 BLAKE2B 235cd91828467df425fa31ec3396985a63a12eedf56b45786d1b1f31ece2c601821b275db39fee999cf988a5eaef5de3f3c6021810afad46bae4f8d0877c09c8 SHA512 98fc290aa33cbe100026426dbb56d9245dd7e7fe8fdf71913cd8b2ea64b6bba674128bd1134c2c12bf71158f79d09e1e99f4a624806d2278a9a9efa4b7574446
+DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
+DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
+EBUILD bc-1.06.95-r1.ebuild 1510 BLAKE2B 2d4e498eebe76077986a82c249c6bcbd2fcf6628b27c499cdab4952822b992d11854cac88832f30c5a7b618f96bc9b2063fdce9bb3f118d8df5b0400f7f0a52f SHA512 d246ee01a277848789ac860c52d4b1bbab93246b02e5baf09099ba1e88978f824e34abaefa732a4cdf7b41bc7186f959c622fbe2b9fceb14af41e0a313f3b1f4
+EBUILD bc-1.06.95-r2.ebuild 1618 BLAKE2B 6aca65843c7ae9adabd29865288c81fc544671f5f8f27febf97a04eb3516728187d9e3eb736485616af670ba5443866b355981d05b3d97448c1931e85e1ff13c SHA512 25fb59a3666e7f1ec64e61c737f14d66fe0c480bf2c4011d094d2cceed1dea9961fdca716543fbbdcafea7e295376f64a1f61a2a56f29ea2ddc3827ec3809d11
 EBUILD bc-1.07.1-r1.ebuild 1428 BLAKE2B 5906c47db0d91b491eab1ff96ea8800dc5b33a5369318cad29a33d1680381772d375ea77580b8bd4bcff0969255ac77104f9bca3be158029da741d1a2bd175d6 SHA512 5e78ec01eb60c593655677eecd0fb8d4a5f0b941bf90d90b172cb2a9eb85751a2a8012c905dede7bbf14718eb8ca7f5be3f9770e16e33d5fefd80fb271dc51d4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r1.ebuild b/sys-devel/bc/bc-1.06.95-r1.ebuild
index 5edb18881141..5ae9bc3006cd 100644
--- a/sys-devel/bc/bc-1.06.95-r1.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r1.ebuild
@@ -25,6 +25,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CONFIG_SHELL=${BASH}
+
 	local myconf
 	if use readline ; then
 		myconf="--with-readline --without-libedit"
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 23e3d478171b..6730e90a8280 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -29,6 +29,8 @@ src_prepare() {
 }
 
 src_configure() {
+	export CONFIG_SHELL=${BASH}
+
 	local libedit
 	if use readline ; then
 		libedit="--without-libedit"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9c2305e0e7fb..7b57e2b95288 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -16,16 +16,16 @@ AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54
 AUX gcc-spec-env.patch 1544 BLAKE2B ebd019ff63f6a8526f741f1760925538f10b25c7d5fc69bc015e27bdb468ddf1239aa9d0af21520ed1f286babc98b7418828e212b68415d238cd2c78b43db2f1 SHA512 ce9c1f923e2c6d17347ec2d3d8482351a9644194b2753627389294d43bb4f11b9c2ef41eda1b46ad83d09901a0bedebd5b6b8a57a198646030ab61e8d2d8cb48
 DIST bounds-checking-gcc-3.3.6-1.00-r2.patch.bz2 829688 SHA256 eacdaecd9c07b6573a6522ac776d8daad7658c4214a7fb0ff950cd47ff811ae6 SHA512 d4533d02289dcd2ee11952f83dc687d82624d6e31ddb548e4f54cde4ef9cced5a1aac5b64086441f8930274e31f20d0ee82850fe1257f96c08b05d406d3b2e26 WHIRLPOOL c9d39cef9408472634a689a61e914ea01e6f67294162d16fcd5b451d1b33aed86f842adca8e4995c863ca1ed7a4e5fc0ce68d99a78f1e765cc3caad06ecbf6e9
 DIST bounds-checking-gcc-3.4.4-1.00.1.patch.bz2 815566 SHA256 6568f904eb26ff4bc90e23792b3346aaf98c0ffe38a1abe853d823b3c2157e96 SHA512 da11cb354d5ec95c74081c2cbb29bcb49817a1f9d6875587b4a27f1c9fdea8f07eec8147b739bd18a4fa2365e5da50e4bca7d7531612fbf2514c50516d225ac2 WHIRLPOOL fedeb8ca85af5bcc924243cafde3a96f0ddf69df13a1e2c68a207c0dda3d598af59b49a92c35e104a16f70af86a0027a7630306d23aaf873f48149a64e86347f
-DIST ecj-4.3.jar 1377431 SHA256 9de193ea393ed50d868b730bad6916f7a8ef4ba80216f8606d3e1a0dd886e74b SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff WHIRLPOOL 9137d6aa5b0e34a596e8d3de8843b5478cec8cdd4113303d554120ba8c6d467e802414f861ff0d7ef1d85dbcb09d4ccc10668385460d1a476345e2de86798bce
+DIST ecj-4.3.jar 1377431 BLAKE2B 1d6a8ae1cef0fc4ee325f935873e4a2e560c34cac929bc4190c7dd47e1ca4480ad608f0b7a5d00f2bde30ff2dc78f74ccb0effa48db1df9358a6e35ebce32100 SHA512 c4be72186d81747f1adce5a50de303c24bd6ed9f401bfa8871b1b864fe7591392218b1937b10d0e76014de8e0b6a1d5c4280475976218141cd1878c4a35217ff
 DIST ecj-4.5.jar 1470676 SHA256 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e WHIRLPOOL db54206cfd5eba935e707b8d36ebac40f3c4ed3c1f06ede794288cbdd9c7da9d90c0898e8c98b383af276ea4c1b40c861ebd9e1fc1dce712946184321339d3ad
 DIST gcc-2.95.3-patches-1.4.tar.bz2 125654 SHA256 dbbefc926fb07b17eb18d4c8bfa8b8d1d956f4484c19e8afecb0ecb995232886 SHA512 7cc79439162ddf6f5dea4fd88e172e815684a34ed70e67f33c6acf4e1a687a748a78dee232d462adb5858cc3f9609e34cf1b8a75707947f4fcdf3d33251738e5 WHIRLPOOL d10f43b3081eaac83b6e22cb9aa863380415fe73da9e167b9b961b37419161d385e70b4f0fa9bb03399ecf77ff289b58cafd804a510d7366c21496c82ec416f3
 DIST gcc-2.95.3.tar.bz2 9848842 SHA256 cf91a6b4f41248895f06bcd0570a62d2417ee99d32e6e2c5f70490e0eb6af5e4 SHA512 683eafd1788a0021867797796444868100d244f72749dd8f014eb04495554ca43eba852179554710d516ff4b94527f40ff9c9189e007ef6fd958ec7293f17e4d WHIRLPOOL 7605984ae8bd948f116e319a47b668327d0e83c301e4391abb66a72a58868fc90e5c8d3298d9444d4852a0073f71a9f36389add96bc5b54364d7943b397bd027
 DIST gcc-3.3.6-patches-1.9.tar.bz2 51760 SHA256 9759a4dc139c9c739a179fdabff484c8b2d036707f0be03ca54fdb7f7d4ffdb4 SHA512 306220c537c5cd90af7638431e6547ee9a80199c384629b5fbda06c28b2d6168fcf1dd448c0e178b104f41e03a8ebda4f389489d205b9e66ade6637e4747196c WHIRLPOOL 0a49ae8fe42f24c8c0e1a9d7671c462219e501bbe2fb27c78a723889cb084632899403d78230e7618899d2cb639bdeada0d5c577949a87c1d249891cd22a5b01
 DIST gcc-3.3.6-uclibc-patches-1.0.tar.bz2 28882 SHA256 c007f38cb0c57291adf0b367f31e14c84dd1d6f48a388896eb63b6cd4328e418 SHA512 d060c1552d4f21b8b1cd6a6e56b9af4f62f61ce8ef4362afb1982b2ad9defe6a9648705cf780103d4f2061737553b6737c276d79b803b6b75ae94035bc881f0e WHIRLPOOL 524204cc41097f13e0de2ad8e99ff80d449c490d602625d24ddda6b874cf63194d62c22f98469f5ee89c8283df82a25fbc989db32a52f31f2a31928b5a522f2f
-DIST gcc-3.3.6.tar.bz2 23972413 SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed WHIRLPOOL 27372f9d12cdedaad38e75c3efea3430d6873d92f85ec0024e2cc5ad986c710ed940edecc926a4c25ce14d14cddc1aec3eb35ac2c29e8c85309685d525a99cf1
-DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2 SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa WHIRLPOOL 79a7bb14e220dad7ea818afae12839ff7cc624f128bbf7a29c8005478f6da9742ff08100088baeaf36c038f7ddadc4ec64e78d5283ed19efb4d3625916a3b00a
+DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5ad75c41de86cb37f854be6b7a6a8dda0e65d331461469848cd912e25920e8aa2dcb142cb661731ba571cb5de1 SHA512 576b88e2fa675314a79a85f180684fe5af370c596476a0bf02e33e8ae0e2be838417ea80675ce4194a8213792cf7ada50cae5131149e4b890ab61e0b8d50d0ed
+DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
 DIST gcc-3.4.6-patches-1.8.tar.bz2 61940 SHA256 69822a3b93d8288a1e2c2536c738f0af5ccd286143000c43fecbf62c90861655 SHA512 14c12628e0ccdc47492890a46d45f9ef1df3970d1103116c3c3be76ecf1b3560088232819891662f44d621877b59ed38dab48053885bd34e6516d7de514f42d6 WHIRLPOOL 74e2046a4f04fe1127ae67f29ffdfcd5ff5e0ac27c62e03252a8e754a74bd8f9771d43a53818272f165bcbb38bdc5c15729910f63616fb8494e09dde15f8fd86
-DIST gcc-3.4.6.tar.bz2 28193401 SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18 WHIRLPOOL 19fc447592f1feee56da74ee6d9436e0813e5a29ced37f8bf91836bbf0b1b9023fe2f717f8c3cf6dc84f11d2029cd87b65e9176b19727996420b589716cdfa45
+DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
 DIST gcc-4.0.4-patches-1.3.tar.bz2 41994 SHA256 2995b5c8f29f9f6c0a8d5039d24c3af62fd8a707ea81a7ffd978ca5f336bca75 SHA512 34999c783b0b2af782ae316c7a874a40a3e98faa8eb48409f951fc167ad4fb56c4fec93dc5cb6831b89f2dd90c80e3c89778fd73b9f176cb4470d8f5d1537b03 WHIRLPOOL 5f56b4ac0ef4df6a34c099b505a8cce01d277ee7d17dd79e542f1b9513cb24a0c23f1191e3933b6a0782d3c181c1c6d72a72837e9c9da1c1685c10103b8a37f5
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 SHA256 2f4386f423de421b1171c6312d82be3f646fa249df9672687bf8c37a72d8d1ab SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235 WHIRLPOOL f7cc0a984272187e88683683e7c484d6d40cf70efce4ded1ad5cae2849a6a51214280453eb60400d3b43a310a319b39dc8f7f88a5857d69ea91d73e0bfe6b663
 DIST gcc-4.0.4.tar.bz2 32642939 SHA256 f3fde051c96d2fc084f6f4d6114ce4c1a079fcd1247d947d50a3d1641acafc47 SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd WHIRLPOOL 58749231707c5007f5907ef3916c9f2941bb42e0890d754c9e62692f5e049955a766bae502f233fa1ac084279432b15effa4b632a87c2c50db4f24c070ae9762
@@ -33,45 +33,45 @@ DIST gcc-4.1.2-patches-1.6.tar.bz2 54513 SHA256 ce3653368abca2cde342cc68dc1288a8
 DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 SHA256 c6ed88711a727ed11847c9b9f1cef7023037bc80c0840eda5fca6d60fa02e35a SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b WHIRLPOOL 6a0eee923be11ad415eed56f4acc11480747aff92d97baf083526866d3c7eb63ca1fe51375fa70b9223f863a25e4487ebe9ce9da2acf1bbf6b55c6ad2d1a7010
 DIST gcc-4.1.2.tar.bz2 39707720 SHA256 cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc WHIRLPOOL 5822040f7e96919bb906ce55e0bd19c4c85b3a47ce73f0a4b6d0da62ce9d7651b6cbeb6199dafc38582b206a98126e3efec8d54cc58c7f303ca708c9261bec57
 DIST gcc-4.2.4-patches-1.4.tar.bz2 25768 SHA256 425b423a1ed8f0eefcf244f1d4462cb1e11699befc2a1d2b3f908ea5d123668d SHA512 dacd9d13f29e1e7baf136dee564fd0d128c20f77a8f7ab745263ad9dea8c694c006b89baf93f9aab7a0f93b48c2a54d80c4196f83f0f27c0fe17f7fba9a4fcfd WHIRLPOOL 69cb826a6a7914e121732208b95450bc0fc1b9dc9ad08d67c87fb7643b7777ee51fea5a699a8dc94b5abe570d6a1b47d95027764fd695e5572ba3c32c27f59ea
-DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 SHA256 45fe49c144db3c23f928f0303a80071145361242566671afc96b6dfea5ece221 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed WHIRLPOOL baa4c6bc76deff38d3f85e7b91f53e6f3785e2d315cd835aa8d4a80b580f43c2fa21046df85f17d8c81f95a91c0fa782078963a2849ee1604f3202c9790b9d27
-DIST gcc-4.2.4.tar.bz2 44025458 SHA256 afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9 WHIRLPOOL 242177c7adc1538dfbf0b5519132902479c9a8f21158ed04bcf29a3616bbf98d0cf4def13e602ad0226e745875c327d33e8f45eae1b1e6de6d61e2a0ca1b0b90
+DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
+DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
 DIST gcc-4.3.6-patches-1.2.tar.bz2 76826 SHA256 55fd71e268afd1bdbc799a4dfb69c86ff6e08019159ff94d9cea5512a5f29af7 SHA512 229692a6026ebadc4d87342fd11695338c0fb2a13c43ed6288710fbdca4d7330c74a2c8a46f60637be9c4c38365076f068d35c5a91faa1c69a55e5e7aeac79f8 WHIRLPOOL b0f282a8579261af35609e3e4b5a3998067e16e8b75a65da866893052be023032e3108f2500681ab9e30e4ed673f6eb6a61dd51de17476e831a1f8dd11db2ca3
 DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 SHA256 6ad4c3a5f6c359eaa2b6d1996cb2098c4265d00b7d3a33e9db880301b1166e69 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120 WHIRLPOOL a2855f10474da54173930eccdcd9a6afe8bfd54d2d612c4ee1060e0bd68d83cbaa7aef9efc5ec2c329ebdbe903c2bbd7ea589b2b391f896409b8f04df46617a0
 DIST gcc-4.3.6.tar.bz2 59756702 SHA256 f3765cd4dcceb4d42d46f0d53471d7cedbad50f2112f0312c1dcc9c41eea9810 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee WHIRLPOOL 43694948728163150276be24b386a6ba5c12ade91a3836059f2665e7670ed011216fb144e73fc79de8a16988f77a3d789f781ff595ea241a7f2ba88e4f624306
-DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 SHA256 f6c7cb99beead66dd4d06f7004c5731a9360330cbe878ce79792c618e008eed2 SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517 WHIRLPOOL 8a1e45aad9d306cb19de93c63b5854a97e629d90852feb6861dcfca042b6257705304fc13ad65655a4cb227d36b83fc6063648c94f270821574ee0e85307094e
+DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.4.7-patches-1.3.tar.bz2 25866 SHA256 26daf24267edc8d1b9974d18df770652fa90d3a2062ddff2933997646f93b3bd SHA512 cb59c8bb72a5414a9930f63e55a175bdc57d51dc518ec7d1245684f4576daa139e10dbe050a75ac960607cb0a5ed52c49ed7139d74398278bb7012ecda7be09d WHIRLPOOL b9e79660977ca3d82fea5f957270003ac27c3fab7f4da72d7bc169c3a7158b95084ceb8c537b86f9f67a3bb966533d1fbfd1f40463d8fa4daf1c20033048d256
-DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 SHA256 f68c52de7aa8b172f7b43c3b576902c3d02ceafdef954cbb76f4fa2e02dd66f2 SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb WHIRLPOOL f28c1d2b7ede7315e60eef0651580b716ed89f0cfbeac59705537f3cb70ee748eeb3913e0344a40421e27d2aebf3162466178acbc7c8a555e06bd4b3818fa43a
-DIST gcc-4.4.7.tar.bz2 63179340 SHA256 5ff75116b8f763fa0fb5621af80fc6fb3ea0f1b1a57520874982f03f26cd607f SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e WHIRLPOOL 588dc683b0526d0d9f0b178cab54e30340741a49752097ad4fbbe2da4d7fef5e6d17e321a078726e2797604de280f8ad39309e05eaf6b4cfb0d1e7167c2a0aeb
+DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
+DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
 DIST gcc-4.5.4-patches-1.3.tar.bz2 20108 SHA256 4859c23ff400061d8bf3fb961f025b321700ad49f27badd9bd6ed204ea3bb49c SHA512 ba5781da360b5049ba07aa46dd45b8405540dadd717ceb88c07d8803ba91a90b9ee32147932d3dddf1ae1ece148589cc2b0e709a3fbec7fe56266f6e925fa8a5 WHIRLPOOL d2b82ac67bf0a574c7fc9976831cce175af78f08cbbffc1b0fb95ce9748d65906c70fc681ea4390bc76222f1042c9d6fe7a879700aeb0b0f60ac89328643c64d
-DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 bcfaac58ee057ca9fdbee9295100379051b3b7df8abdf33f24da6cb3c75b4d20 SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a WHIRLPOOL f3cae558649cdbce9a7dbf0d006845d88349926d1e3d7a4717f2df5c413a1da236b9e35fe0618844578408825b6130533570146c525525a0df18223b3ebf479f
-DIST gcc-4.5.4.tar.bz2 66426133 SHA256 eef3f0456db8c3d992cbb51d5d32558190bc14f3bc19383dd93acc27acc6befc SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 WHIRLPOOL 1d3aa5f344171a75144118101bf475536940eeb80f73849827ee4103c52dfb6504d9b26e21fa0984c65c5e6267e02fa6e7f8ef539c44f45470790781080aadca
+DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
+DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
 DIST gcc-4.6.4-patches-1.3.tar.bz2 16443 SHA256 0ff58a1142164ccbcc172470945812343d467da3ba0cdfa338deef75252316b8 SHA512 ed904bb8438a23a2e1ec3aff28c4451128421426305ff07de50edbad51a066bee9d1a9042a9b26c36dbd57e1eb044a474088945d6d780c6e98d7563947fb9b9a WHIRLPOOL 0fbcb26fdde71415e492f86d5bdf4605ebea283192426f121f6d34c2401b093a06ef0eae61c64abee653621efb1611ef39902d535ee8742061af8459131632d5
-DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 SHA256 946334cc62c0afa2f50a435dffbed12fd32c170f0850bbdce47df188a1eb8918 SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133 WHIRLPOOL 2ce7f308a21fb5072d08a640390eb3f453ad8d811df897b0f9d3e917eef4680fce6cce231159ffe96e371f3c299264eaa51cd110124a3a126f04fb6d8531639e
-DIST gcc-4.6.4.tar.bz2 72006076 SHA256 35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc WHIRLPOOL ab1b035f43aec669640b36037e65ae0edceb3b13b1ce4f7900aeff5ee06686dc2d66c3dd81156f53c4e9a9a806e4becd4462f72a6c4ad7e646b632c10c23356c
-DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 SHA256 cef0f9d5624fd583eddffe060fb882e2e3b7ed43e517e03df7b3472189237327 SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca WHIRLPOOL a5d76b577615de7a472f591bc031552f7b3e4dec7fb58385709235d763d416f47c2fa8ff4c73531ad023ee50dfd25b1e0c1752dbdca4ae19f736cc79428d63bd
-DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 SHA256 6b568bd204e3ffb177df1830e5a888be3987491b4183bdb6ad75ad83c642a348 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6 WHIRLPOOL 42e348d5925cf4d43697a6dc06c911cc617f89037949ce1d8f7aa0fa93405f460e7416d6cd00e8fb2aac54c6f26fcae00691917f1517fcfb6891925efa3d3400
-DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 SHA256 cbdfe2947f653e11ac391dded461416e5cef1ff8900cf8fe92672de797b4018b SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52 WHIRLPOOL 53c8bd64336eb55d8e3d62a33267d3d99c0239d5c818985a9830fd776d766aabf4b0bce630949c5b522580566e2eeba1b59bfc1b8388dee7ec6c990512d2c499
-DIST gcc-4.7.4.tar.bz2 82935453 SHA256 92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189 WHIRLPOOL df8408e80634ce28f105f9abcdcf38fba5c130795cbe48428527a68819abebc3bc7152bb6ad714e40c71450a08986b48ddd630c887e1b2faf07c3babfe720969
-DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 SHA256 4a165e6a387421f581f49c742243bf013c9fb7c91f44514be7b38292178ebbb4 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506 WHIRLPOOL d31b3f48e13e5a9292b704afc745cbea038e61eedc4dba0d659558b56feeafec118043f3430457f71dc938760d72860e4318b2238b3bee9fba069c740327b78a
-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.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.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.1.tar.bz2 10762 SHA256 19e1c07f87b34626ed0d73f73cfcdff7ca8f7abed172fc6832bb7b08ed5140a9 SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e WHIRLPOOL 583bdc54b07da7ab9a9bf84f0fc66be2c1212f4dc9835f9bbd4a3474800246f82dc195f7b2ccd40077082ead1f8c57e02d54ba13cb779c30acfdc40fb1c6b0bd
+DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
+DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
+DIST gcc-4.7.4-patches-1.4.tar.bz2 18072 BLAKE2B 6bab25aee9f9ef605ce2942928a9d1aa91371b8fdec00643805e5010a4b0ffb043e0dd1a119d1064f79e499983374ed39e475a9718fce632cad07811363ed56b SHA512 9f5d68ba62aee909023542dcece81e4e448ea750254258107d4f70291d8ae99469c4518e42ffddbe6b622b258f463127be6e6ef7eaaeeeb0f59b3b719f3eadca
+DIST gcc-4.7.4-piepatches-v0.5.5.tar.bz2 15358 BLAKE2B e0df0b19829d9f9b1e8719467a6e15336d58ccf50c182c3d14438bc7e8690940535f6391b83f359c4e0bedf16814b7d4e2b0888f4698740be511bf6a574f9556 SHA512 f5e078bf4c17f7b5be102f1e3358d91c72e80363b5e055a92461f78399a1bf27bf6cb690d41900719bb260b6529f5d1aac999e613fda6ac5e4efa27f622510e6
+DIST gcc-4.7.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B b24522bd5516e0f2bb4e8d20437e0a0aed22ea8cae3c78fc600688f71a57bb7fbd3d431737a30e4406a9ff5426ed7d2289b3efac4d5efaa5841f7db290ef023c SHA512 c2e6c96b74365f8233f6106fa03d94075b60f6f77c683aa2e27aceb007da723243f8e3ddea8b178e6a0f7939b8e35615165534dc74e5050f87680ab261a31c52
+DIST gcc-4.7.4.tar.bz2 82935453 BLAKE2B 98cc902dd1506161b96c8eba10e5a5c7fb11d2dfd95ebac15825806fcdb262a1ff962b72275dcfc8453b753164fc234bdd666b207202cfd5a0a2b4cd09b8c741 SHA512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189
+DIST gcc-4.8.5-patches-1.3.tar.bz2 26025 BLAKE2B 3744dfcac069b5f8321fc9cfb019d44c848d70d17e5908d3d97f0c314b98a7fd884235fec2b21c93027f6152577439f6d424f96836b113dcd589604af969c756 SHA512 8d190f81ca0d25281250dbf0a670fcf12334b0811a5bf664e6450942a2996d02b979c6e8f8760b287edad06df3d1f8e2fe5cb0c3dcf9677c3420457d841d9506
+DIST gcc-4.8.5-piepatches-v0.6.2.tar.bz2 14265 BLAKE2B b3bb37957ba8ee446967a3a60fee61c26a49f237241bbaf8bb3c3ec63656dd0492f518b129c8ef43cc06091742bc9c0b1042bb612c1110732b1e9608f28753ad SHA512 cd6af4047d4719dae9dbe86ce5342c7d8ddec38aad032486713b08e1b0cb711f5ca017e08d583137d51b8d4ef673366ba310e71bca7b49b82e9314781d6e9d99
+DIST gcc-4.8.5-uclibc-patches-1.0.tar.bz2 2976 BLAKE2B 1a804fd0b2fd5756e824f3eb511cf62d6af0fa8059ebcffadf6deb85e242ec8728b7883f2e054b465b87e4b61b6a2b55061a68eb8329c3a79a659d4c15808d21 SHA512 5469128eab06525915c75241797ad9ec4b63072ebfd5e110319bf810633cf3fbed39bbda4f6a0c74e537b248e7642780ecbe2086ad10be6e66b7dd289fa6534f
+DIST gcc-4.8.5.tar.bz2 86165587 BLAKE2B 760931013f96083078e74b8376eede6c23954e1f41cb44dbbdd8220fdede48807d89b9ca44fc4ae309f7cef441831b533512f1145cd563c5c797e96cf6cf1bfa SHA512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea
+DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
+DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
+DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
+DIST gcc-4.9.4.tar.bz2 90097606 BLAKE2B 373ff939ea72d6c4a7f3ab899b852b4c919481af2cfe3291281d9354c58a270d2eba73a0f301d90840dfabf423c82b368e113df7a2cb6cc28b2a703b0b6eb585 SHA512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe
+DIST gcc-5.4.0-patches-1.7.tar.bz2 32316 BLAKE2B e913960ae76931acdd93aaf4414b4da1d4d043854548f865f07b8f3df968e9c87783965e3aff2e89468f9433185029d66c2e2e719b492d747fa280861cbb0cd8 SHA512 a9da763a19a616a70324721013cb6f1749deb20a5d1994273683ea43436f09a97b5e9898b0f605354d5c0310e23a8a7b8c8ccd28631cefc240cebf969f18657e
+DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
+DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
+DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
+DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
+DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
+DIST gcc-6.4.0-patches-1.1.tar.bz2 10762 BLAKE2B 13ea709b6816adb52d7d82540b55eaea87e9790b88556cba1065a28078f071a4287fad598c7b677f429fb1463ca20a0d05a6884bae0be2e0026c5e998573a35b SHA512 5c2d5a227788e174d4d8d3c137d315a93ed5e1e6fcb9fb43b56e801fe63d973f25cf72ee8cd32752e98a9da17bd07064344c4299270d4b1992bdcb31682ae10e
 DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
-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.2.0.tar.xz 62312628 SHA256 1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1 WHIRLPOOL 9503fb08731d94b5d79b182579f41992e9db16dba8a034cbfa8a2703a975185859e79c1e3f6094d14d08c7f5d7135c2ca5ffd8d6f7ae7820c20d4076fe5e9f65
-DIST gdc-0.24-src.tar.bz2 1012099 SHA256 cc6a97c76c9e6db31e76ff97014d24b3d43e21f018a3c6218e3fb2a4500fc79a SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686 WHIRLPOOL 22322b0c3e2d67b3b37bd7fa92a29c593688f934d4ffd62b9cc87eb63a44a4f8bbc9d75cadf11209c73bdc9942c9b4430036629d0eefcd04de9055c502b85f12
+DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
+DIST gcc-7.1.0-patches-1.1.tar.bz2 6746 BLAKE2B 29ed4ff1ce6412a0c1a88f613377883ef5d391e7f681989295ac84dbb1950d99a17472d8b95a9351970ee5837cc3bfc4711101042c0e792c0bac3327bfa24d2e SHA512 1bf95a505dc6c37bf6924bb69fd0670c8f3355b6690c94edf4a4248649accbd426575b40cb7a473dfb0ae09a924b05619e5c633384bae0293edb670cfd0d3a30
+DIST gcc-7.2.0.tar.xz 62312628 BLAKE2B 35e4b732f1a4515fc1a9d4424797177112847588e600dc5531bc9bf72305619d4100e8fd9d945920245e704fc9ac5bc5e3dbd20be6c3af49e689fc5bd1eca10f SHA512 f853cd6530b4055d8d8289da74687cb4c6d5f363598d386332d31852b581bac76c3adb7d61889edec3b779f63d8646f0122840f12965ce4a4389ba535dbbb6e1
+DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-2.95.3-r10.ebuild 752 BLAKE2B 45764d63636c0fa25a7b7538a814f8e3088e5b584f0ccdfd290064bf2d2282ec0804d5c525736e7d1d97bbdf4798710fd79a71ce8216c9665e3388efb1f34a0b SHA512 88e3a89474f1b46077b74a7c9931cdb7275bedc72d2be4ebb0272f45ae7a64b533fc80263275839a6c67fd2ce5cfde6580d28b613a37608db26b3c62590dbd82
 EBUILD gcc-3.3.6-r1.ebuild 1249 BLAKE2B 4fd694cda071603038aec136b37d6722b135e7db317c210aa484f68f47eaf0489c126ceb13309f84e7a96e034761835d1ca1f3baf88ba373f391bd44ace2b074 SHA512 a18cabe5c02f3ba85b28292ce6fd0e3973ef15f5ffa847fc67d57ed2d04d96e1a6910f36a9ec08a4833eac3e247df5a7893bfc19ca6354233352d38651809092
 EBUILD gcc-3.4.6-r2.ebuild 1374 BLAKE2B 7e38335fa6a4dede1b581fb2b42c14ebab65a16c81d10517601a1e8e9f63f42673ed099f483616a0a720ea01b43e97c7a05362665353bffa6bdf8b56409318a6 SHA512 5c31bf85dab53b0670ca7606c29e5fcdc9cdade9596b02320d95e2ab215952de4dc2f4fc4ce17bf4826c26bb76e820135a9317198753cb071b3ff7e39f1069ad
@@ -87,6 +87,6 @@ EBUILD gcc-4.8.5.ebuild 1401 BLAKE2B bb8e4fa2c9f919a7954cd78863223e653bc14924456
 EBUILD gcc-4.9.4.ebuild 1460 BLAKE2B 48679b12acbc9c4aa0db5451e36c156e351cae29f1978c82d53fdf926d2d98e77c43138ac3ca57c08af60255bccb7f1b360fe344617970282b1568438c10f558 SHA512 ad95c792c32ef356b3943bbcc4a1f16ba3e891e5f11ce872287d620d6d57aa44a8941c1e4c11a1fcdc10f4faf21f02cd513c6a36d210bebb7c5207a9f05d7b32
 EBUILD gcc-5.4.0-r3.ebuild 1278 BLAKE2B 43319867893e4666f48c37567d2c912a56084e7f292303f73fd74adcb8e886f67086f0acd86c1bcc5e033865225a9ced6f98b036677df41eb206fe5f676526f7 SHA512 0b51d9a3a8795b06c3b1f0096969413d73fb5b88dee9ae85ac499b1ba0dad77a066f740ab8873bad9a8ad1c3795af446dec9faa0c67d236f65958937b61583c6
 EBUILD gcc-6.3.0.ebuild 536 BLAKE2B 3030cbdc580f19e23420134768a2fdd07c015dd4ab78920f644c8672c514789ff59aea67a4da01b2b366c7b4badf84d0849659c34579ceb7d5b79caa78148840 SHA512 a01f1d52b881a6e87124a3de3cd062562ba4a561f54d3ec3f68d0732958f9c7d12df38bbe18b98bd4c77e005410f2065146dae83d2ff76018c381935f9b932f1
-EBUILD gcc-6.4.0.ebuild 530 BLAKE2B 2c81d72a02020a6917eceec3899394745f86fa6402f491a11dc5f0503fce27a44e721158d11e533eac48ee62be66611d569317e90111471c4c6ddf9751c81752 SHA512 f50bfe855693973af39c35d1fecacbde17c71992606e4dfd0111b5b10419652cf6eba561fd4f353813ee3b1bcc55a819af7f70e6fbb3745dfdb771c1123a665a
+EBUILD gcc-6.4.0.ebuild 529 BLAKE2B fa9a60528bb0e85285df689888a75f12ae0b46ec1ed9eebcaa16da7473faee0e7d51ee8722b2e76496c65b1f2bfe85b4d2629750819c399b252559dc946bdfe8 SHA512 b3faed07a6ba32474b86c371facf7e68da7eae20a9fb2215a20b1334910c0c707620a0f90cf7d50cb449eba270ac53fc49552664ad1adb3715e478d37fc1fb33
 EBUILD gcc-7.2.0.ebuild 558 BLAKE2B 64f93aa345b418bd324c5962a0edee943d0d07499702a3468021a15b63915ff1486a0f2d07ea7f1ba0899556d4fec4fc0b51abea662d8e5299fc7b5989a9fbd5 SHA512 3ffb6eefa26a967fe075879b41e9fb67f7d6d0175762aa8044ed466bf37adc19a4eb090109f16c7b03874db67f39a39c9ae77a26e2682f7e3b145b45711ee51b
 MISC metadata.xml 2520 BLAKE2B a0b5788500fdb6eb7c6d88def963dba88b67e4f0cb4a5ca0def3a25600601d9f5b339a2f48759ee7e2cdb7d46269d0b5d9a9f468e15f5977c6c0a2214f89226c SHA512 ffb6644c39848805fdc8571747be210a3057a6189e9007c6a0371d5448fc37d45615d4293fff0ddcf599c6369146b5a54bbbb091d250548a486456ed89806128
diff --git a/sys-devel/gcc/gcc-6.4.0.ebuild b/sys-devel/gcc/gcc-6.4.0.ebuild
index 43364f617286..dc74a919609a 100644
--- a/sys-devel/gcc/gcc-6.4.0.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-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"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 74dd8fb90441..a8905eba8057 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -11,7 +11,7 @@ AUX icecream-gentoo-multilib.patch 1579 BLAKE2B 60603edb7e3809648d99e8c8307d2b5f
 AUX icecream-r2 1733 BLAKE2B dbd919701df670e7cd1b47cb39fa55eb18c6e539ffa637e2a505ee60b15bb9febd54237b57f42214769e273f5a5fd29cfcc9e29a0a941807388fd9cc7d133226 SHA512 033ce0d49445db3afcbdd6724863651d4951b8f36f6253a13854abe9ee976419687579089aa1c5c808eed08aad357e34bb9f1e70570857cc39f2515ac2f211b0
 DIST icecc-0.9.7.tar.bz2 379527 SHA256 ba01c19e946d5a142ad9f912c24086ee12e7ca4927d64860787eb4bcd100657f SHA512 023a77d6df33af9837a87218272dc61d68f3782ad59dc8783ec3ca47cbb38619dbcaa25ac7e6654c6cacbd79477c3403b0a73aca595c6fe20aa9a39268f4f2e2 WHIRLPOOL cf822cc6667ceda286b41c4fd172092f51d75cb2c5d1ca3db0dd32796580128808881f09053f209d7f9165ccecf9e97093925fca1ae54597b2a775485d82004f
 DIST icecc-1.0.0.tar.bz2 485534 SHA256 c2897fac52711b8442ec40403c874bc50a10184131bb7006529087dfe469c85c SHA512 4292ecef6232112c3f4531cb2290a55f70c5c24095fef0865af2526d49fc10a043ffb06d22552e161f671c18ff1ab62795c3a63e2c8cb26f869cf65d0938af2a WHIRLPOOL 3c6e79756bd290e03fbfcd5fd5e38dbb700e0a7b1206c2a608914123a9f317f1d9896332c79909754fda6fc9c515a29dba6b4c485a505d1ca0fde315c35cd3ce
-EBUILD icecream-0.9.7-r1.ebuild 2713 BLAKE2B 532448264b12a65a97074795ab3e9fd70f4a1bec9d0fa5ff6fd93821e5cf5df998f50a8610fbd846b75e509cbafd0b8da1e82ad8908ff872ee9e061141031a8c SHA512 5b79e2c5722f1632bb1ccff1341168534d78cb41c1c779825758f5e3f3f6f2bcaca58018d2915b54efb3fabe65b3cd3f8007c1a4601be240457105f8143b3ba9
-EBUILD icecream-1.0.0-r1.ebuild 1022 BLAKE2B 0e17c372a6d5d4b13ccadfc96ad29103f952f6a10279a507351598fbef1727115b98fc9e45706c23fbcaec15236e3edbee63b4520c7a0da02288f2e8303b1312 SHA512 bdc885463b426c96dc64e668f8e3b753d7645149286910a705102931b3c81df56e855caf4e6231a85962ab9cdfb2ad9920224c359aeee49193f1b6d7a8ee0803
-EBUILD icecream-1.0.0-r2.ebuild 1314 BLAKE2B fd6a87262cb299a9e58348a270528eddb0e8307bd93205e168bba2333c2823b239b3eef011bbc8edc35f774b273b964c5c686364f38ea01c1901fd380140a44e SHA512 f5cb905b24d48c97a44f6e7ec5a064854913b1a686f8a8f163d8bcb73ef5e9c8ba42ca89bef4c19d75492d8fe1363c78dd3187ad8f0a82d30c83454fe58bef37
+EBUILD icecream-0.9.7-r1.ebuild 2690 BLAKE2B 33066b670b761f62311f9c77d87752a0b4cbd0f7728c4f5660b3d14bcf918b7b048867e291fbc4394af13f59741a74aea89278016c45acca28299a94f4b0be6d SHA512 dbb33736b75924eec4c6949650deaf43d7ca4fb71634a06cac426d83935d84afaa7b454ebcb1f0cfd8d7f9ce3a9b738a9211b80e5f3696d5588cfc5b94db8718
+EBUILD icecream-1.0.0-r1.ebuild 999 BLAKE2B 26353a1b05833c331c6eb6e6cfe3c072bf9b44be1ce6fff7448847412047b429ac825ff6d474aff60ce22c9fa7442517f8e857befa2db807128a98d8738f5c0f SHA512 99b9d1ce36c0eddb0f6edbe974207d7c249fa53aecb1e322cff3c395f04eae107a35a230f3ea38acd87d5b85d7b4df046c7214a175e960db8a44d2a386105e4a
+EBUILD icecream-1.0.0-r2.ebuild 1291 BLAKE2B 528af02d207edecbf9973406a1af78d95b9f322e29f85c167813977129771eefb73c94e2433843a2499549abfed05431379fc203cb7a0b0506ed946bd9119f00 SHA512 51c981a819d026bfbfb7f25ac4935b3d92074903fe9dc9870d91752d3cd25d4d64177cf6d9dbc2daf83beec66979728b3711e61fa1d47cb21b41523e374eb8db
 MISC metadata.xml 433 BLAKE2B a094925907c2d2f0b4481f250dadd45408f77e522dc9218bdcdb789128ad710d48a248b02402032b19a98985626271cdf03e7bdbfe98f27acd6d52b59277dded SHA512 df66083874796cbeaa39519bb61c871aab7581c777321eba2b37de89968fcdce685b023729d785dff99e33ce81f64345d2cf7757deffa5d2dd563d0de1b92c9a
diff --git a/sys-devel/icecream/icecream-0.9.7-r1.ebuild b/sys-devel/icecream/icecream-0.9.7-r1.ebuild
index 03105d9b5c31..1c43a464442e 100644
--- a/sys-devel/icecream/icecream-0.9.7-r1.ebuild
+++ b/sys-devel/icecream/icecream-0.9.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools base user
 
 MY_P=icecc-${PV}
 
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
+DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
 HOMEPAGE="http://en.opensuse.org/Icecream"
 SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/icecream/icecream-1.0.0-r1.ebuild b/sys-devel/icecream/icecream-1.0.0-r1.ebuild
index e43d004caa23..20c5f3e4bb21 100644
--- a/sys-devel/icecream/icecream-1.0.0-r1.ebuild
+++ b/sys-devel/icecream/icecream-1.0.0-r1.ebuild
@@ -7,7 +7,7 @@ MY_P="${P/icecream/icecc}"
 
 inherit base eutils user
 
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
+DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
 HOMEPAGE="https://github.com/icecc/icecream"
 SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/icecream/icecream-1.0.0-r2.ebuild b/sys-devel/icecream/icecream-1.0.0-r2.ebuild
index ead3cbfcfa51..68485a1e7f59 100644
--- a/sys-devel/icecream/icecream-1.0.0-r2.ebuild
+++ b/sys-devel/icecream/icecream-1.0.0-r2.ebuild
@@ -7,7 +7,7 @@ MY_P="${P/icecream/icecc}"
 
 inherit user
 
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
+DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
 HOMEPAGE="https://github.com/icecc/icecream"
 SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/remake/Manifest b/sys-devel/remake/Manifest
index ad76b8bf72fc..3bdf83b7417b 100644
--- a/sys-devel/remake/Manifest
+++ b/sys-devel/remake/Manifest
@@ -3,9 +3,9 @@ DIST remake-3.81+dbg-0.3.tar.bz2 1078924 SHA256 55647ac9d23ca6f634c77eeefacbb45d
 DIST remake-3.82+dbg-0.4.tar.bz2 1360407 SHA256 2c08b996805aa709e8cbd6a75ac3e3952fc03622a1407c450b60bf4fc19e4275 SHA512 5f75e7826e4258c33e3844d72d685f1c1d252c352b40c0d6a7a3e5155097496640ff72542786452fa40079060b4c0cb514bda7147521c7170f42003ba8c0aa77 WHIRLPOOL 81b0fc2e7ef8b5c55f93bc77de7bcb9f21b819e36a4eb393faa53b5876dd5115e98f62da46c693ad93b554a5f087cf69fd3edcc8895a710d10cf44a94f7119e4
 DIST remake-3.82+dbg0.9.tar.bz2 1152677 SHA256 491c6da004a3517a6c76d62017279374fd594f5c09c823b4de53e81180c4041a SHA512 94682e9d0317088456dac683d67be320fe10bb06a3384969fafefe091558b215105ba3c96a7c1d4e0d970ea2dc5c4f535a704256fe7a4eaa87bec11d78d074cf WHIRLPOOL a4caad6c8acb74e8284946db7fe5ebd3bdf806a2e79309030d5ebbad132a161d32d9bfc6a567237793080b285cc928ef7c88a4a97b921d8eeffe041ca75a8e81
 DIST remake-4.1+dbg1.1.tar.bz2 1254246 SHA256 42eb79a8418e327255341a55ccbdf358eed42c4e15ffb39052c1627de83521fe SHA512 e0dfb0f7a3f05968c3597e73f2fd486929893546a8f993e99ae73c6400050d1faa5baed1b0588d399bfc6e58e8504f857c8734e39a02efd875b522b26dfaa421 WHIRLPOOL ec018e16450ead020758cb004a70da15c168f00e51451dd23bbc1388e7c71401675543385f929b5ec54618a3d8023887aea19a25ff7e9808e42a5acf8afd86c1
-EBUILD remake-3.81.0.2.ebuild 626 BLAKE2B 51ef73382c41d7d71a1770342d49d584f56bcdeef665bf12518d650d9ba3ca6930ecaaa25065a5c3a3559764ce5b5458aba8bb8451b83d527cfda9cf148e297a SHA512 6659e4c23a193d226cc6bbd39ab11fe44350a52e77a520e3186e29ba78871412109e12b370a1f85b6888e099df4f5bda01d2ec44997e297fa22616672aef3d74
-EBUILD remake-3.81.0.3.ebuild 629 BLAKE2B 17a70bdac6df24e5954e3d4498c729275b43344ea15fe89cf2d119767f5abb4d667b3281c00db6b602e5bc737a070e8a95a0984321814950b9708043a092a1ac SHA512 41a8affbc8f23ae65212a8a9a56e3a2eedbb37c34193d9d17f7711cae2ac6d681d86b0112d89ebc1799348d8fe9b2542abc16d9998d09edf9c48e909f9ee1287
-EBUILD remake-3.82.0.4.ebuild 678 BLAKE2B 409f48b4c1e37371c120e4f28eeeab83bf768860a4e53a97de196324e0b4ef5a53e78d37b3ff1e58cf8c6981435c300f9f09faa5b4252b90fc6775dda56b10b4 SHA512 44f550803e9159a528c91f59519d32a285eecf40306b57c023605b268ffb38306c8b422de18a34d2a72b6b29445d23f0dc7cc5c4f796b6c1d585b03d438c6c9c
-EBUILD remake-3.82.0.9.ebuild 627 BLAKE2B aa91e5f284f50445583e91f0aa19da8f4886b7c7146abd007dc6bdb663a4188a07b499519dbe40fce747b9981342a2a279b738bbf3d5c8c21ead7f0ddea9a4ff SHA512 d0b978401613f65bd7128ab6b36462969ca06237ca23444b752f6b5c364aeb60eaca2d51e31d30454853f4f4d85fb3660b44d7c05743c490f9af388cab8e17ab
-EBUILD remake-4.1.1.1.ebuild 841 BLAKE2B 2d27943954c04626442fccdf050a0870e747c85a5572c579d10c081d62aaeacbd744adc3530cff555ae194bfa4626d7cc62aaa0d459fa7f54d52af78f50cff5b SHA512 0a7d6055ec1d79656cf1df4438a1f9cdee7021a52ebc5031040a294705e989b80ae3f0a68e067d02183fb6b40d5d16531ff0223ff5ebe7756d15df78bfd19093
+EBUILD remake-3.81.0.2.ebuild 619 BLAKE2B 43542bb75b5c2d95bb0e43862564e526352bfd7f38ea3ca39eb3143c536bc2b967d0bd5ba11b9a1ebf385969a3dfeae8311185658b2ab1d6775e50b7f381921c SHA512 755492e86abc68dc4a47b9c56a1901cd539b5dcaa53434f81c8f85558fc4b8af32af05eb35ad66b6f7a32f213072302f0abdbb05b76febb4a4ac48096604186a
+EBUILD remake-3.81.0.3.ebuild 622 BLAKE2B 7ce9b7344bf8e9422f5afc6ecc1cb62f92e4a7d2618d9f3ed70620efb644fec91730a3a49ade5159ac3fe790ecde5e9791ceb9ce942282d4ec2da84a0c0a6569 SHA512 e1fc4511a2d5bea155529303cbd413cd86483a323ab701380e8c21dbd4300e5b367e2ed311573f27b2a4165ecd1746c5706f8b6ddfbdd95e4470c148eb703e43
+EBUILD remake-3.82.0.4.ebuild 671 BLAKE2B c344fffbe3d03c07e198ba565fc47c776865eae7f17d4ff79b6e329bf401505272e22bbe961a6c5eb79b534d5ad34f45b9718073149f8f16a9de666d5307031e SHA512 a36660fbbf43e210a8397aea1ff31e00655901ac463efbea95d95c1177a9fea2f674be32937904c693bf584293b7621cf41a3883d68bad75d2215216c3052ded
+EBUILD remake-3.82.0.9.ebuild 620 BLAKE2B b81d8e2b9c9e3bab02b116f21ad5484d7b2e49711a9ef5f9d71660aebc1e02c515e0ac82639fe51f752042a0fac4d7e6d995b36ad0ca090418e3b3be58733153 SHA512 78bfb6261ec1bf419ad9740154aa7caba439ad973adaca5a0c7cc7e68a5ba696195f097e3171f186e44f899a7e297d21c7fb8fb2b5828b98a4e7e5327edfb496
+EBUILD remake-4.1.1.1.ebuild 834 BLAKE2B d04bb04d37c434dc64790c4b744bd46b71857c547d44ddf735ba03d211381cb7ac408c2cf84d9c1cec3db7b855c7d4d58526390fd269fd9658f3e5251c3ee1cb SHA512 703662b02b790965479822a6017a0b64407641bb9bb3c8dc50d5aa3853a2a5da80b2c86d4849095383a519c6613b51b4ec0054deeb88c43878a1c17b38cb757f
 MISC metadata.xml 326 BLAKE2B 4ca7da15d02026b12d85b2329d0096bfc817d29b0618a97a61f54b9c6702b3cc89c4674510286c88b59eaa7142b98ff2fdada61ae5d56856b3e6a9e08116a954 SHA512 69c31da5d0fb8b94548ee398fc937405ae11224a415dc7ad6628c9b66362d43c4e3adcfba05016735298d31eba68faa19dab93f3d792629217660e51c382567c
diff --git a/sys-devel/remake/remake-3.81.0.2.ebuild b/sys-devel/remake/remake-3.81.0.2.ebuild
index 2b1dd0fd6862..778fe9991885 100644
--- a/sys-devel/remake/remake-3.81.0.2.ebuild
+++ b/sys-devel/remake/remake-3.81.0.2.ebuild
@@ -3,7 +3,7 @@
 
 MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
 
-DESCRIPTION="patched version of GNU make that adds improved error reporting, tracing, and a debugger"
+DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/remake/"
 SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/remake/remake-3.81.0.3.ebuild b/sys-devel/remake/remake-3.81.0.3.ebuild
index eb9995e6d1fb..48a21c789b6c 100644
--- a/sys-devel/remake/remake-3.81.0.3.ebuild
+++ b/sys-devel/remake/remake-3.81.0.3.ebuild
@@ -3,7 +3,7 @@
 
 MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
 
-DESCRIPTION="patched version of GNU make that adds improved error reporting, tracing, and a debugger"
+DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/remake/"
 SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/remake/remake-3.82.0.4.ebuild b/sys-devel/remake/remake-3.82.0.4.ebuild
index f8af7b441f70..4addc0f86355 100644
--- a/sys-devel/remake/remake-3.82.0.4.ebuild
+++ b/sys-devel/remake/remake-3.82.0.4.ebuild
@@ -3,7 +3,7 @@
 
 MY_P="${PN}-${PV:0:4}+dbg-${PV:5}"
 
-DESCRIPTION="patched version of GNU make that adds improved error reporting, tracing, and a debugger"
+DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/remake/"
 SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/remake/remake-3.82.0.9.ebuild b/sys-devel/remake/remake-3.82.0.9.ebuild
index c31a0bff1d2b..d675aaf24fed 100644
--- a/sys-devel/remake/remake-3.82.0.9.ebuild
+++ b/sys-devel/remake/remake-3.82.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 MY_P="${PN}-${PV:0:4}+dbg${PV:5}"
 
-DESCRIPTION="patched version of GNU make that adds improved error reporting, tracing, and a debugger"
+DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/remake/"
 SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
diff --git a/sys-devel/remake/remake-4.1.1.1.ebuild b/sys-devel/remake/remake-4.1.1.1.ebuild
index c629c155592e..bf782cdf5407 100644
--- a/sys-devel/remake/remake-4.1.1.1.ebuild
+++ b/sys-devel/remake/remake-4.1.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 MY_P="${PN}-${PV:0:3}+dbg${PV:4}"
 
-DESCRIPTION="patched version of GNU make that adds improved error reporting, tracing, and a debugger"
+DESCRIPTION="patched version of GNU make with improved error reporting, tracing and debugging"
 HOMEPAGE="http://bashdb.sourceforge.net/remake/"
 SRC_URI="mirror://sourceforge/bashdb/${MY_P}.tar.bz2"
 
diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 8d9ef0895ba5..5f44f5491290 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/libibmad/Manifest b/sys-fabric/libibmad/Manifest
index 4517863aff68..2057d965d761 100644
--- a/sys-fabric/libibmad/Manifest
+++ b/sys-fabric/libibmad/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
-EBUILD libibmad-1.3.11.ebuild 439 BLAKE2B f619b0c3db5d93694c680a3ddec18bd27bb6b02653d189cb28cd87ef3fa43159d5fc46de6875b4d8d1bd06e6a3b0b8027e8512a2b7faed849b4741d9b3a6fb72 SHA512 b7e65b2adb22fb2b233239afab2c5060a65f26d7fa77614e905221bba89fb99d5702875114188a39433748a95b7bac2704297d5570397020e0bd7c4541b3f199
+EBUILD libibmad-1.3.11.ebuild 422 BLAKE2B 69acc5cb4cf59053b254438612237c7de98f13a41f0eeba832a6a22bed89cfaf3108dac50197cd1dc31e6dfc63560de1acf6f3388b7b1f4291ee9ff5f9023cbc SHA512 ec7e6138d75d58883dafae85c2f43c03db560083ad1a495a1859696ff8d80dd7a479269946b9d9779b13c95a7b68bfffb4f447196309f153aac51abadd245c0a
 MISC metadata.xml 454 BLAKE2B e10e78fb3c911fbffbb73c6d651fbb109989ec91c7038491957a561584eb21079e96552fb2662143f35ddf3abf4a042dfdbb7f6a54103779e50d024bf5ad1dd9 SHA512 22297997f188da3ac0859c8d2d4483ae15edc7a0b482ee8d2717ef290b4390c7d6cce8cc48d7785a6d5fde0cc1988a3fe662315596a11e96ee1d029e7f549b6f
diff --git a/sys-fabric/libibmad/libibmad-1.3.11.ebuild b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
index 24d0637bae10..15b1fa2d4be8 100644
--- a/sys-fabric/libibmad/libibmad-1.3.11.ebuild
+++ b/sys-fabric/libibmad/libibmad-1.3.11.ebuild
@@ -10,7 +10,7 @@ OFED_SUFFIX="1"
 
 inherit openib
 
-DESCRIPTION="OpenIB library providing low layer IB functions for use by the IB diagnostic/management programs"
+DESCRIPTION="OpenIB library provides the API for use interfacing with IB management programs"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
diff --git a/sys-fabric/libibumad/Manifest b/sys-fabric/libibumad/Manifest
index 5c6abed738b4..02614aef252f 100644
--- a/sys-fabric/libibumad/Manifest
+++ b/sys-fabric/libibumad/Manifest
@@ -1,3 +1,3 @@
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
-EBUILD libibumad-1.3.9.ebuild 432 BLAKE2B 6d036057c19b03413af4a3e5f75d747bd8887c7f82aa00608be520d05e59ff5aa07ba9719f2901e12c3b2f89c7057c80aea8d3536d5d2d9293a5851073c7c72e SHA512 285ec603f8c64aca333bf24cba49a4fda9084078eeeec93175b30717fb0a5127c30ab7ddc5997336da4fee0263d56ed34c18cf934929430ce14b4834a6ddb12b
+EBUILD libibumad-1.3.9.ebuild 421 BLAKE2B d7d0aa662022c440675db18ae297b41a992da238a1a403a318a3f5d1ea1d925d1dd178939c2bf3172de642130fdd9c263c16c8775f4448187c16a0ec596894e7 SHA512 410f621914764f55a29a5354df09d0de830ced54c19cdac39aeb8acf0a2b617ca11f050dbbe68b0efd2f15090b2001a6677c0e616bf703b5521ed54802a878ca
 MISC metadata.xml 457 BLAKE2B 47b958d90c27e26665e210647dd69f4d80c79385fb3308c55ee738f1d502493fdf0b358a30655601c6dcf2ef0be586c4d446b87e834feb26c83cc5bef5c49754 SHA512 028cdf14b93f7b842077d5905cf24b7def813231b3c86eda8666cdec86b166f90f49c45c082ac7e84d08d02f1c7cb3ede5ad3e5477a2052009617ae5f8105a29
diff --git a/sys-fabric/libibumad/libibumad-1.3.9.ebuild b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
index bff21fae9297..07ae7dc87cb1 100644
--- a/sys-fabric/libibumad/libibumad-1.3.9.ebuild
+++ b/sys-fabric/libibumad/libibumad-1.3.9.ebuild
@@ -10,7 +10,7 @@ OFED_SUFFIX="1"
 
 inherit openib
 
-DESCRIPTION="OpenIB User MAD library functions which sit on top of the user MAD modules in the kernel"
+DESCRIPTION="OpenIB User MAD lib functions which sit on top of the user MAD kernel modules"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
diff --git a/sys-fabric/libibverbs/Manifest b/sys-fabric/libibverbs/Manifest
index 7da8d24c8d00..02db94d5630a 100644
--- a/sys-fabric/libibverbs/Manifest
+++ b/sys-fabric/libibverbs/Manifest
@@ -1,4 +1,4 @@
 DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
-EBUILD libibverbs-1.1.7-r1.ebuild 696 BLAKE2B 554762dfe9188910324d510d2e77246edba476004221a7775e5463d48ff0aa0527f3d46048557b188aeeca9a25c8f22f0a6e3ecf80cb9bf6127f2ad70ff5067a SHA512 74efc712c5bd6898815fd22ddec7408967d4e77c4d38c3bcec4286607108f0be411bbb03d34a500f5b8b4eb379c65d100d9210a9972f1e525eba0a813fc6df61
-EBUILD libibverbs-1.1.7.ebuild 441 BLAKE2B 90fdfe89d0366920f7c83cbf50cfdc4061a8d85a133a14aefc27ac0d5c3c993d4c65014abde08fe91e76bb56f9191c46103dab9380e55deb66cb2d141cdfd569 SHA512 8666fa024b493ef1ca0f75867f3905a685c075a61d1e8bebed948f6578ee5aa5394298e3097755d21f4a61ede7cf0269464da0edaa2835320a36f001df93b543
+EBUILD libibverbs-1.1.7-r1.ebuild 678 BLAKE2B 0dfcdbc046af87129df08a4a5097155e6d88c26c6d973ba9688bb981a5311ae1ee3066c7378da8558a26854ad41916dd24980fa7cd4ea8d55e384727f911167e SHA512 ed11aaada9d9b791ca6e5794ede946776806f2004f4e5c947657505705d0c6579045e433818dd32bd5c092343a9c2ae8d388db2bfa5b01bf8294cb6a0c08c28e
+EBUILD libibverbs-1.1.7.ebuild 423 BLAKE2B 4bf52e0c1e27b40f63a3312f0b397ad11ddcacf8457b26342ddf85b27f0ee260159938e2680f4e16da4cb5e13b405886905ed5b2b84b122a9575984b9817c962 SHA512 b7248eba080976a0396444ae78567a74d3b4854922cb073e3fbeded685e45f6e0fe3fa6d1ce1ed6596faaf04c019818eb16a22620d040548155d904729fd8846
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild
index 9f87e68d527f..f0490bba053d 100644
--- a/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.7-r1.ebuild
@@ -10,7 +10,7 @@ OFED_SUFFIX="1.gcbf2a35"
 
 inherit openib multilib-minimal
 
-DESCRIPTION="A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware"
+DESCRIPTION="A library to use InfiniBand 'verbs' for direct access to IB hardware"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="static-libs"
diff --git a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
index 1f690692693f..770cefe90250 100644
--- a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
@@ -10,7 +10,7 @@ OFED_SUFFIX="1.gcbf2a35"
 
 inherit eutils openib
 
-DESCRIPTION="A library allowing programs to use InfiniBand 'verbs' for direct access to IB hardware"
+DESCRIPTION="A library to use InfiniBand 'verbs' for direct access to IB hardware"
 KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE=""
 
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 7c5074d6845b..cc428f4dbee4 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/Manifest b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
index d646832a9e92..57cdfe476c67 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/Manifest
+++ b/sys-firmware/sigrok-firmware-fx2lafw/Manifest
@@ -6,9 +6,9 @@ DIST sigrok-firmware-fx2lafw-bin-0.1.2.tar.gz 36486 SHA256 f28d411240a2f460d334e
 DIST sigrok-firmware-fx2lafw-bin-0.1.3.tar.gz 38531 SHA256 741d84ccd40b506957629b4a541380c67d7f845001775372c75bd993bc1520e3 SHA512 b7df7d55fba2e9e3a823f80a1f1df2232631875a4f3fe57e4ef52fa9bf8d307524baf9cb7602d61b89698f12d9bcc9d6f93bd9be30fb8027f320229b089730f4 WHIRLPOOL 5191f179899461460e3b6137242d43a37621ea3a56ec43f00f25b9da72b7e6cf2642b4215019ecb9e84c680deafe5c595ab701c8653db840aa546197a8c2abac
 DIST sigrok-firmware-fx2lafw-bin-0.1.4.tar.gz 48760 SHA256 e48ae384fdcf3f552b91fb35d1a49fd211cfdadebbdbbb5b31befb8eb0f8a35a SHA512 06d2fa53408666360629eaf738bda676da0616da90530e3fd6c529c2b54e9432ab3893d7bfe6e185e43fc8166ac6733fd573778e55d529a8d84dcd44d7f8a4ca WHIRLPOOL 44ed927a4884e83029584f848803e6266677e76f1888b1b71c7e98520e2fb07eff1d61aa2dc77419745c4e963bbecad4254c701a3ec5daf4042804df1f80f355
 DIST sigrok-firmware-fx2lafw-bin-0.1.5.tar.gz 51438 SHA256 a81b358a042595b95af239db6cada32734ce14dfb784d4c6b95ee09985cd66b8 SHA512 39a5a49d51f92ce256503d0e682ae565249642d8479964327777e3795a20762ecd0fdeaee96c172e72143f5deb52d2cabb7cad4b5bf081c7576c2dfaa62b7b9e WHIRLPOOL c439a0e0d6fab48b9c5b4c0f38b770014a59092f0d41cac3ce883990237d955ff5f8d3ea9a64c57ea879f3d53a3e38a1bc5ff769ba64bcc971f029c23138dd34
-EBUILD sigrok-firmware-fx2lafw-0.1.2.ebuild 1075 BLAKE2B e1c50d615fb88fc91766cddaea8747508f12c66b7a4caee0a42ab08ef70bbb0d95001e77a9dbeb3a85c620f9e12039d91acb0197ec35d76e6482d05e0b9b94e6 SHA512 e64648eb29fefc35d7261de107be27d61e76dcc4f0c985075efdeb424e36ba703e1ba14b1172324dd738a2a855d9aeb3d7c94684471ac2a9349048977b3aca0c
-EBUILD sigrok-firmware-fx2lafw-0.1.3.ebuild 1186 BLAKE2B fe5aad79564ac1d74c4c3df06efc3f1b2194219c1629e4bb2eb8aec9635a4911c05d0ca3afcc1b8086759fffd04ffc3bfedb63a3bd3bf2560e73e690db164308 SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff
-EBUILD sigrok-firmware-fx2lafw-0.1.4.ebuild 1186 BLAKE2B fe5aad79564ac1d74c4c3df06efc3f1b2194219c1629e4bb2eb8aec9635a4911c05d0ca3afcc1b8086759fffd04ffc3bfedb63a3bd3bf2560e73e690db164308 SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff
-EBUILD sigrok-firmware-fx2lafw-0.1.5.ebuild 1186 BLAKE2B 911ada673ad8745d23c684670d665331aaa8f88b8b47ac6525757d73da83005f8f6c843b606999c8aa518a38eccf42dd8f5fa48c7b3b891cc3e1a769c62df9c6 SHA512 bab65ec7b08e989c1401829902460f3a00730e25f40fd2c105e9dc2dfc50d8b1f91e7f13919f1da632a2690a4a5074be977068a30daa4b2a287c7b2b264a276e
-EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1186 BLAKE2B fe5aad79564ac1d74c4c3df06efc3f1b2194219c1629e4bb2eb8aec9635a4911c05d0ca3afcc1b8086759fffd04ffc3bfedb63a3bd3bf2560e73e690db164308 SHA512 020ef4e6e3ca01b0a59f771e595b8acb74a3dea2e818e00751ad7b8bf6e53dfb6b7ebd98b4d1565e4bf9c3b57dc4a12aa57bf2b31d371c434afb79494592e8ff
+EBUILD sigrok-firmware-fx2lafw-0.1.2.ebuild 1047 BLAKE2B f71e6fd13bbf133f56ff1e1fec09319bd50fae593af0e51cf4f265c57dc9450e237998ec9a880f30e50f427262a2b5b401a9d243c7dd6afd5d71234bc66451d0 SHA512 537e64891760f9262bf989b07ead0f2d2251fbdba5b3670e855cb16c203b921ad01725b936c4c9cc98cfcb9230d317109fa99c4dfe4761268a6424ac945eb93a
+EBUILD sigrok-firmware-fx2lafw-0.1.3.ebuild 1158 BLAKE2B 5c7273f44d5656bacd8af0c24bb3a2120c8e99cd53ebaff3e891da737cd16e21ba800fd142e8d378244e3ed78de589df92fde6d6920a674ef80a5599563445ba SHA512 a4d8043223ff92a6d06ff2f85f312462b637549195f6d5ee8de1fba7a6ce3acbf98a43dc63702d610dd03a7b2582da7fbc88f18bd8ebdcd9dac722ee355c2e00
+EBUILD sigrok-firmware-fx2lafw-0.1.4.ebuild 1158 BLAKE2B 5c7273f44d5656bacd8af0c24bb3a2120c8e99cd53ebaff3e891da737cd16e21ba800fd142e8d378244e3ed78de589df92fde6d6920a674ef80a5599563445ba SHA512 a4d8043223ff92a6d06ff2f85f312462b637549195f6d5ee8de1fba7a6ce3acbf98a43dc63702d610dd03a7b2582da7fbc88f18bd8ebdcd9dac722ee355c2e00
+EBUILD sigrok-firmware-fx2lafw-0.1.5.ebuild 1158 BLAKE2B 519f8b9ec188043a1c665ee272faaa7c944027b1df0728fa5e2e546356d3f25ba8e22e5bab3e5600f4e7a8bb38fee21a6c3955d28c5fcb11a21440dc77e4ede9 SHA512 1fad9239bbfe7b6220750a7f808b27dfa5eac2abbf3ceecc785d60f77228910fe3d7912855363d6b528a6e1dc08044aea1f318c737378961150e7bb5346519a9
+EBUILD sigrok-firmware-fx2lafw-9999.ebuild 1158 BLAKE2B 5c7273f44d5656bacd8af0c24bb3a2120c8e99cd53ebaff3e891da737cd16e21ba800fd142e8d378244e3ed78de589df92fde6d6920a674ef80a5599563445ba SHA512 a4d8043223ff92a6d06ff2f85f312462b637549195f6d5ee8de1fba7a6ce3acbf98a43dc63702d610dd03a7b2582da7fbc88f18bd8ebdcd9dac722ee355c2e00
 MISC metadata.xml 329 BLAKE2B 60a84f5e60d450cb97c53317f470cd599c61b39d3bbffc579db58da460bd84d4b0bdf28a1f9b4d90cbc01bea3e36b0832df78561984eff849256ce50387bc9ae SHA512 56ca5a2c5d91cbb7ac9b3578fdc6eae211a8474649cf418464bfe7b96ea303b2fec80bcc24a0c490ba79b46d0d0cf44832ce3ef9febe1ee533cde57ccf12ddf5
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
index 667a214a872f..25c0349553f0 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.2.ebuild
@@ -14,7 +14,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
 HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild
index b0eecf836950..abf2f553eaba 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.3.ebuild
@@ -17,7 +17,7 @@ else
 	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
 fi
 
-DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
 HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild
index b0eecf836950..abf2f553eaba 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.4.ebuild
@@ -17,7 +17,7 @@ else
 	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
 fi
 
-DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
 HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild
index 6589c0b0b0ee..f32c06811d80 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-0.1.5.ebuild
@@ -17,7 +17,7 @@ else
 	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
 fi
 
-DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
 HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
index b0eecf836950..abf2f553eaba 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -17,7 +17,7 @@ else
 	SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
 fi
 
-DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
+DESCRIPTION="Firmware for Cypress FX2 chips for use as simple logic analyzer hardware"
 HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index af4d8ae992a2..cfea2c38df65 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index b3839742c6d3..852fda5feb52 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -16,9 +16,9 @@ DIST freebsd-share-9.1.tar.bz2 6733003 SHA256 2bbd8aa05d52b18a1780772a8518d79d37
 DIST freebsd-src-10.3.tar.xz 126900216 SHA256 f50763dcac88e9b7ec616b77d537bf338f470350e2c85e0cc7decfcc8372b54d SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f WHIRLPOOL bf5320bc506fb73a63d0fb324b60667a196ca2fef5d0215637a657c613f2052d76d002deb205e258f6d4e2aaea15490b26679e59a102606a34b58ab1f6b755ad
 DIST freebsd-src-11.0.tar.xz 140252356 SHA256 0725a7f1d3e8985f4b2e31a2ad714334463a5016b203073a8fc196649f3d5a27 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd WHIRLPOOL e1cda77189990c1d2187ab2d9e842ff3c619d8235f1ade56819fadc52f680a871de17cf05f8119614557c615ad19d41d1b6080c4b3768e7252889546b865d827
 DIST freebsd-src-11.1.tar.xz 147661560 SHA256 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca WHIRLPOOL 3f88b15153c25c7878d1a730213e5bc8c200c05427895ae97280c4412680bb8e67cf4f8170f9e2b0f21d63ec42365f44f7d5eafe614e9b8726f4bc3cc3825202
-EBUILD freebsd-mk-defs-10.3.ebuild 788 BLAKE2B a1820ce8333eaad4840eaec6fa41db39b0ec1412c914dddcbb8b92f41c25c7fd7a4ab167cfb944c18e126d5a06e365644c119904e04c337afc300a3887bc0525 SHA512 6ac51811daa22723de886e74ebdea439f7c470b8b694e4f23290c5ea0e0adb2318d6fd437b37a1c93efc19b0c10b9dfc49715f7b9d91a7ba1b26c8b36d2d5def
-EBUILD freebsd-mk-defs-11.0.ebuild 1149 BLAKE2B 05cf104e6782b1e2e2d14eff2abc41072e502d71ea71f70d1ade5498c686a9be8bcfe3985a7e555cc85d9b5d0a3a25f575100d04067f91b096fc5c4020bc8bf1 SHA512 fd01633abb5978ef5655cbe94a014937a18489bb6d04285e7df2e80f5c10cd7a6e33fd0733449bcc791a0cab05fc80ddb4230667806bcfacaf9d4dd4e9fff1d3
-EBUILD freebsd-mk-defs-11.1.ebuild 1149 BLAKE2B 3d73b59c1bd1ad82375f38f4f7eefce1349d29c797c495bc49e783ac2c1e8e241665a232081be5322024d310308d92fb03d36617ca3c56749a5a34aff55d90ce SHA512 b7fb837f9b5012e3871a49411b3847d5bc9b0051ea714bcf530f777a28f4332eb6300eb0cd0d8c61b6b69cc80ba42f072f42bc2038aeedddcac7cb82c2ff88e2
-EBUILD freebsd-mk-defs-8.2.ebuild 748 BLAKE2B 3bd3fc4d8f6508cd700eb57e698055232bb0c0ac8ccd87718ddd38d985f328765caa8b576544b8e8a9315b419a3d6dbc2651f49233868a6b7df72d1327fc166f SHA512 9a22a431da4e76eb6c65666a90d1b43c06cc7670dc218684a38ab64e1dff49315c10e6c39dc9bfcd8ab0d0891b224dfb4fb80f86472e5281695a876a413a2d18
-EBUILD freebsd-mk-defs-9.1.ebuild 772 BLAKE2B a8268af0cb0ef5c8de32599e0d14b8e83acc3ecf86d1bf608c588235cd815c7e1127503206854e5ac0ac1292060345a4c5d1d080474ff45cdf2939f7860f9062 SHA512 cb737ae76e02f4a8105bde9c14737370a10b1c5c0962ded3275c1faef30fb84f2328409a89b243f5cfd91cec67d73c6da0b0c63a17453311a67ab56e91033dc5
+EBUILD freebsd-mk-defs-10.3.ebuild 787 BLAKE2B c026f6210192845b6dfa1d7ee002a508c948bfe5fd007d5b6e94d644761db21f9c354ec37d0df14d68257dbf6bd28002c5032f639757c2d9056ab43f2053d8d9 SHA512 fbf44cfb7aaf7ba1afc00e8e6a63ccdd892da89dc33fdbec6cf268ff85d8170030bfc00c0612ef33c625515d057017ec8ae4f858a920e4b09f3eca63fd65b14e
+EBUILD freebsd-mk-defs-11.0.ebuild 1148 BLAKE2B cb3d1d4bf485f33e972534886906b4647a6c3ac887bf62acbac85c71a6aa2b1854db23b79f012741a06953a6419190dc897e2a93ccf435d717e4d2cbd5938297 SHA512 d26f7bd93d912a1f2064d7e126e537c82e33e9513518a2f7d7457846cd47c288ec99c0bbc2555c5a67c874f35da20b441227e408e97e0dbc7ecd81198e5b1da8
+EBUILD freebsd-mk-defs-11.1.ebuild 1148 BLAKE2B 5e0cfc31dbd47afb392c69125e3a29c251216436f6724dad42aabcc55f87f27fb0c687c325a284b18d3ef7ce470cf15356e05a057bad439485682ead320d7980 SHA512 d3bf63b18797b3eb4193859f3c61e5ed810f2fbd9d491b82b072655cf7f9a42d0b69c634b9877635455ef38ecc2e29fc6fdb9179a5a62cd31570d8469fd294bb
+EBUILD freebsd-mk-defs-8.2.ebuild 747 BLAKE2B e9cccdc3219e909ccf310c4db464bfd1b2b1e58a7c0fc464c982824345b66b0fbdbaeb05f14fd1ca59a4c94b72b821cac7f2e5f6a5c7e4ae1e8b97060b5f1f96 SHA512 d2d55dddec7729ed3d31738635e67bbfaf668986dd6f1057cfd7464fa9a1c0c43f6fdc14b8aef09fe80b4bca34d04595ed63aaac6442ee9818f7bc3c05843778
+EBUILD freebsd-mk-defs-9.1.ebuild 771 BLAKE2B a6f9dada17e0c081e8fabd61ffc10bf69bc4933ecd63b50fc45eef4f6a4c4fa2c0b472a5ae9e6abd320266204e7ce4b80eb8f223285dd893f013811bc27d2228 SHA512 9e94dbdb20de524967b854450aa601f7e66222b9b7aa2cf10f49cdca74672785833f42fb77af467f3be5d768b73edbfaa079c891846b4718ea1c08cfcb0d747f
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild
index d6de89d0ca7b..fdbdef6957b8 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit bsdmk freebsd
 
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
 SLOT="0"
 
 IUSE="userland_GNU"
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
index 626f7863925f..85da1616d6ca 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit bsdmk freebsd
 
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
 SLOT="0"
 
 IUSE="userland_GNU"
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
index 1d2928c159a3..1d5d46f51932 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit bsdmk freebsd
 
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
 SLOT="0"
 
 IUSE="userland_GNU"
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.2.ebuild
index e08e22094a41..9a6038baf429 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.2.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-8.2.ebuild
@@ -3,7 +3,7 @@
 
 inherit bsdmk freebsd
 
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~sparc-fbsd ~x86-fbsd"
 
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
index d5f8b0df4b0e..73ca444f0394 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
@@ -5,7 +5,7 @@ EAPI=3
 
 inherit bsdmk freebsd
 
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index d50512f5fea3..d8b48134700b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
index d1316666bfa4..508558fad8d0 100644
--- a/sys-fs/ext4magic/Manifest
+++ b/sys-fs/ext4magic/Manifest
@@ -1,4 +1,4 @@
 AUX ext4magic-0.3.2-sysmacros.patch 291 BLAKE2B ef3e5d23d4438a72f090e776cf0a6019361c100f502b9ac23afb11446f82b720e5564095720acca7ba6816a8d5b08628bb4d2011736e0bad028d5d417a3b6936 SHA512 9914c9db3876194b08fe2f9752c0f49f72e88a5bbead72095dc186a3c60eef7a29326d51624381f177d31ee50ad4f9076dbef755936770fbfdf55fa7be82ab35
 DIST ext4magic-0.3.2.tar.gz 426941 SHA256 8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115 SHA512 81bc9ba40dc2ea0bfb01bec160a1bbf0bf8a7983241aba34190d3571386f4d7dc63409866737b8d64516a3594eba11c819bbb721a1942c0a675d5675a7bba9a1 WHIRLPOOL 34bb59fa31babb0ac0edf098ed428c0f3a30976ce81edda15c1498e69f5a8d4453e3f7a133bd42dfe30bd11a42561ae8dd653a56e5831a8aaafacc90ba840da0
-EBUILD ext4magic-0.3.2.ebuild 957 BLAKE2B 2d59eaa9ad7d578d4e8545ff001334cc872c9a67b87a3a82dfa5dddc8ddbca17328595a4513f4aaee7676de1ff87ea06fb31f62923072503692bd584b7ab92ad SHA512 29fae83ce7629c1094307254690fa50d89cb62414f878e26ea1f84eca0e02e030c27689ee9bf386dabb989ada6f2eaa65b5b25aa4fee1dc10a500e13f4756360
+EBUILD ext4magic-0.3.2.ebuild 936 BLAKE2B 404e84d0c5b352d616baf45efe49790853e6e69eb6b5764c566efd11e4afb57811c392b6c8977e9b15ad9adfc40a9b1cd21f89ea423665ebaeff5c6d51595d85 SHA512 9abc859a05886a67890585fa8f5b68f3e086f0855bcd78fb9b0340c1917ba356e04d7a5d2175a29889a10fc2fd1dbad66283ab9f1012a07a02ef21a8d5e698a2
 MISC metadata.xml 686 BLAKE2B 1765b0a3550faa934493725aeb42207d1a0f3cfb7bc2c949ea8a0a704188694a3377ff0debe6449c34f4aba8614183b6b2e9f83cd911da672efea9b3fb30481b SHA512 1b525595caa1d1b839dbb3ae96b62449f6f141fdde8ad3a0d30df95d5cc8e23c2b0e645e3d91434ae7861c30852f96619d11be4c439f156ab56cbd1876ad633d
diff --git a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
index 9d37a2331a9d..70ca6384478f 100644
--- a/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
+++ b/sys-fs/ext4magic/ext4magic-0.3.2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils
 
-DESCRIPTION="Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems"
+DESCRIPTION="Tool for recovery of deleted or overwritten files on ext3/ext4 filesystems"
 HOMEPAGE="https://sourceforge.net/projects/ext4magic/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 60222132e5e2..13a8f3dca75a 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -19,7 +19,7 @@ DIST mdadm-4.0.tar.xz 430780 SHA256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a
 DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
 DIST mdadm_3.3.4-1.1.debian.tar.xz 86312 SHA256 16dd6b77c14a15afa23e077f0c157c17ef5cc6054b17ccb38cf5af86f7bf55bd SHA512 ea9b34a9952e1ff836cb931c7eef0ae0c44e3f4d46162c7a7eca24936d6f7168e99d67749b3100bc68ebadc8f256e4833d42da48c531cf71e6e8f3100911828f WHIRLPOOL 44df72008fc89f21a461bc45be230383d906fd0c0ea062327a537024ceff245b47ced301d72d5bfe5a0fcde095e99e14cdf30c614550bce023851e7a6ac0c525
 DIST mdadm_3.4-4.debian.tar.xz 81200 SHA256 4b09a90aefc2833040ae570cf4ddc34f98a67525636d3c9f2fabf8c13b51e27e SHA512 86a9edb8f29931fdfa40037d535ca80f0bf59539fe1ef16f2639e666a5ac1bd90ec617ec1635080ae62a02f7986a6e10c97dce5389555ab7d417885f216c0f93 WHIRLPOOL 07ab64531da08999b3d351d3747a870cd996b67cc4e2df2c9f8d974d170bc9537bed4aefcf690a2e0a66715549ff046520bd1c559b11736467b3f881681068ed
-EBUILD mdadm-3.3.1-r2.ebuild 2880 BLAKE2B 6c5b816c8538884206c030cf30a01853ca6049bf17fc445a4065ba7da143238a04dc81ba79eceb056320832d34335164ef304c947476ad0ba8280c5aaa26bff2 SHA512 3431b69f5a392efc822193101c09f852476b5bb46687601301727cd535d4b3bfa06109d48179536fc51e13b2d92a09d559a4519868df9c551d1a9f6fd9b3baa1
-EBUILD mdadm-3.4.ebuild 2324 BLAKE2B a42c7555aea3bab98666de3b4d81977b8a1c35ac3cc62a54c7c0cfd75703df7a231b90cad176322eed474d2b2a6b14513a24237119d95ce03d30ff15c4b76282 SHA512 4aa81c3db6810a1fb0f425c37b33b61a6f4b99f3e11eca3c61e9fe0379bd430f4bd5454005c9e4e4ee15758f21aefe0e091f3b971b1a63b5c7a42ad3c8a0654e
-EBUILD mdadm-4.0.ebuild 2329 BLAKE2B c16fb75265d1f708cf39afbb0cf0aff3273d6ebe34981956381ffd0c4adaa33663ae7de5bd13e8c5567c3a11112228d1f2cb0461a830dcaae2e9c34d557fb326 SHA512 a1bf72afdcd3b9972366f11fb884c77697f15b5cc3b29936cb0e14bfc74e6f628a6267262ca79160048441f63357f40d21d0def05c491390d9d573264bf76983
+EBUILD mdadm-3.3.1-r2.ebuild 2851 BLAKE2B 5a17d6fd3f3891ec539856ca51554ac06bdf1989ef89e050ed5e0808b3bbbc7560467582f8425a7547781ff4bebfb266485a64480fe582861fdca017512191de SHA512 77a8214ca8f4fab3ee26ed962e5276986c635d8606f0b72d85083cee1c93df6b9ca79eb5afa6df585e4cc5f2f1f8fd73712273ba9199b1f886434be19c97121b
+EBUILD mdadm-3.4.ebuild 2295 BLAKE2B d7b2d67672dcdb65085aabbce1a001cece049f3dff01f6fc089a68df2954663b19684af21d373bdd52f483b12e537f658979c27cf724000372a62a2a881c174d SHA512 e782ba420537d40ee0c25e0d7dbea42ea429374c6e8025ce10ed766d111744fe70fbced96f935ff450c914f2e79bcdf268fd7b0101458e423f4cf19ac735888a
+EBUILD mdadm-4.0.ebuild 2300 BLAKE2B c5c98ebefd06b717c6f4d37507c1a15c9348812d0402327d1e7d2661a209cc0c90537353261a441c896f98ee4516b54d1faca335601aba0604aeeac18e2109ba SHA512 66b5316daee8bcb7ff2a1e8e366533e45113683e2cf64b45c8ff431c8d030d6095c1a2430fcc5049401890a5dc72affb49a9735f55dddaab618bd58f04cfdeea
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild b/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
index 32cbe91c6a73..c667861c6113 100644
--- a/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-3.3.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
 
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
 HOMEPAGE="http://neil.brown.name/blog/mdadm"
 DEB_PR=2
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index 433f455c17b8..ddf71b2cb3e5 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
 
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
 HOMEPAGE="http://neil.brown.name/blog/mdadm"
 DEB_PR=1.1
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
diff --git a/sys-fs/mdadm/mdadm-4.0.ebuild b/sys-fs/mdadm/mdadm-4.0.ebuild
index 048ba5dc9d00..9238d494d065 100644
--- a/sys-fs/mdadm/mdadm-4.0.ebuild
+++ b/sys-fs/mdadm/mdadm-4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
 
-DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
 HOMEPAGE="http://neil.brown.name/blog/mdadm"
 DEB_PR=4
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
diff --git a/sys-fs/safecopy/Manifest b/sys-fs/safecopy/Manifest
index f53b80ae14ee..74036406fa7a 100644
--- a/sys-fs/safecopy/Manifest
+++ b/sys-fs/safecopy/Manifest
@@ -1,3 +1,3 @@
 DIST safecopy-1.7.tar.gz 398465 SHA256 42fbed5d4764020eb0f34d95e97a0e14e62d801c3ef80f89bd497d94d39cc4fd SHA512 ecba54ecc0e0dc13dd6339f8c8dc311fc3ad41ef23318c1aa2a7f6bb7f1529389bedf7b58ea72486c083d39032a6e4a775e5a555a1ff96c669fa7fbd6c1fb868 WHIRLPOOL e71dd8c5db77a53a1cb088d964f1496581ef3ca7d534413f5bd20a3939b32fcab869aaaf05395bbcfd7289982be1c2e4065a55470f5a852b8c552dd8578cd09f
-EBUILD safecopy-1.7.ebuild 742 BLAKE2B 9dcf57327fd8dc158ef1cbf1384dca9c53bb17144bcf4498cbbf003c05be590b9ac2ef5c0967428ee3851d343a52aecbe6a76d5180a16153a29f5a6b80974817 SHA512 eab5e7979985134f79cd89b2961efcad4f1a9e3c0517c1cd42610c9e8bff1f64ddef79ce6af70d7c405b06d22a10b5fb2cd66ab1b3ec109d5fae0eea98250063
+EBUILD safecopy-1.7.ebuild 728 BLAKE2B ba6bf7ff578d64aee96dca85a33c6411c19c5088b17a4a4ba5d0286e8f54f1774012046cd3886373863269876f8e4682a4da11ea67ce588f116352a91bca5900 SHA512 cb2230c4414cf1bd9c6a3603b3864ea82335aee45045244baac6401ce632a965466902ef539e0f89ae460ec12b95188bb2b1c181962932bd97097366cafd3b5a
 MISC metadata.xml 615 BLAKE2B 296bc37f029c836bf495b07a3cf4113d7aca9e9b4d90292c2efa1f9ef14d562dbf6a87261362de774418eb66afa86b5ac23d2c091ac7a62599caece5f152f0cb SHA512 19be4af38e35c1ddc44b6d4429011cf0888713bf6ee3a3cd05b52ae24578f9eb486fb176733b1916a39521e2055e5d6072288bdf3a417f5c4c4514675ecb6112
diff --git a/sys-fs/safecopy/safecopy-1.7.ebuild b/sys-fs/safecopy/safecopy-1.7.ebuild
index d3fba62a64fb..6f164039b078 100644
--- a/sys-fs/safecopy/safecopy-1.7.ebuild
+++ b/sys-fs/safecopy/safecopy-1.7.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 
 inherit base
 
-DESCRIPTION="Data recovery tool to fault-tolerantly extract data from damaged (io-errors) devices or files"
+DESCRIPTION="Tool for fault-tolerant data recovery from damaged (io-errors) devices or files"
 HOMEPAGE="http://safecopy.sourceforge.net"
 SRC_URI="mirror://sourceforge/safecopy/${P}.tar.gz"
 
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 2b06a99a3afa..94bd2532c667 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,7 +2,6 @@ AUX udisks-1.0.2-ntfs-3g.patch 198 BLAKE2B 3b5818ce4866826e3f09e7d0ec0f5ee87a53a
 AUX udisks-1.0.4-revert-floppy.patch 688 BLAKE2B 6af71c88eec724cb4e61f45c82a288ffb1955ce2007cb9c53d6d92eb4a0521dc968852128aef99f59f92d0c8dded5e473d4bbb9fc469813d277f85f68da4b870 SHA512 044f40313ef5c8eeaac512d428e97b420507cd24cf25074768376733cf308676fbb1a429f462e4b06313344de1b7012b43ad4e6607d096758f0dd0e3effafbba
 AUX udisks-1.0.5-stat-includes.patch 656 BLAKE2B 6deb3f7fbdce118480572ac50ac896f56123579c93f1d91165796a806cef1bbd07f301f8f085cc6ea801990206b06004b54815efc2c972309d17cf55ca5c29a0 SHA512 f399d3e242839a339412f03c174975834c2c6e6515ed50b6b87b33974ae091421b5179b12b78cc06d339b41046d3a70ab78767e194081467c2cbd4c8fdc61c02
 AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45595ba8cf6832f560e6fb314e47139104c981b332f0a6b0db3a3eb63b2b771525e3903ad67b3eeb9f1749bd6f86538d SHA512 9402c931dda2f415577f3b6d60cab03891e83cc804a0cbd790bb3bc71d160d8b6fa14d13829281ffb55a9032ac289798ee5f2d6e14348c96a4e9b1e922111bb2
-AUX udisks-2.6.4-udisksdprivdir.patch 827 BLAKE2B e475efee2951e37b12f2d75b41f651a5f4ce87fc7ddaaec692b01e8f9db307a9e5d4104b93a7bf86f5fcde61bc12d6f3019609f0efa1eaa24d400e1510c03d51 SHA512 43c4d01620c6d70a5ae46cbad03fc6d34012e0eed33abf29b8ee14ad2004c22b7c550c9ada11eb97f15195669baae1aefbe1ebf239a3bb97199e24add08a6f15
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64
 DIST udisks-2.6.5.tar.gz 1251008 SHA256 817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7 WHIRLPOOL 43f66f3410d68ef8b6db8050d30ada83307fe5236e011752f67d1f45c5c81c1f4714fe6fde8377544a3054192482731d58206bf8af94e50a9e713df7a78912b3
diff --git a/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch b/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
deleted file mode 100644
index 8564e2b83342..000000000000
--- a/sys-fs/udisks/files/udisks-2.6.4-udisksdprivdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 283e9093d541b8de0ecca324fde8fd38b560dc8e Mon Sep 17 00:00:00 2001
-From: Vojtech Trefny <vtrefny@redhat.com>
-Date: Mon, 24 Apr 2017 09:14:05 +0200
-Subject: [PATCH] Fix typo in data/Makefile.am
-
----
- data/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index af0cce2..83af330 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -6,7 +6,7 @@ dbusservice_in_files = org.freedesktop.UDisks2.service.in
- dbusservice_DATA     = $(dbusservice_in_files:.service.in=.service)
- 
- $(dbusservice_DATA): $(dbusservice_in_files) Makefile
--	@sed -e "s|\@udisksprivdir\@|$(libexecdir)/udisks2|" $< > $@
-+	@sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@
- 
- dbusconfdir = $(sysconfdir)/dbus-1/system.d
- dbusconf_in_files = org.freedesktop.UDisks2.conf.in
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f7748a597160..5d36a6194b21 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index aacf281dfec9..c2d500f8bf1a 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -66,21 +66,21 @@ DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cde
 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
-EBUILD aufs-sources-4.12.12.ebuild 2236 BLAKE2B a0f11b29bbeb0737a4d77a4aef4411dae4f7b2c0c5a0473d6e887c1e9d61a6195f35ab5671d77bb21c1c1d58430e55d3b5fe3a3f83c213c9d489c40c53c3f13d SHA512 f4ae547bd69bac701963987bb6827ed3d41b0841cf021a38c2be4dad153fa0a77e4ffdd8c443dbd5e5f96ae9ec81ca02efebcd1c8b45d6f6159cc73e1dcf7bc7
-EBUILD aufs-sources-4.12.13.ebuild 2236 BLAKE2B 2c69cac97e0c814799eb96dd69f37896d40e4ce3854e70a431499e17abc78d43bddca972b88f1515ee3b84b4ecf21e10713b699013c54b0ebe72c7c53a22c908 SHA512 e724a6e1858469d7ca9330caee8be987fac884b21d800e2f0b90c1dd47b390daa81dade931673f54194c1ad6afb0a5f2a1623769f4859db812861ce917e2bd29
-EBUILD aufs-sources-4.12.14.ebuild 2236 BLAKE2B c2234079f88e05fc83d2af3da146fa271290f0423fdf6bf7ab95850e1ee5764be4ee3b6ad062bf88500038b5334db39161b4b5a8ccffe0b78aedde9a609c12b9 SHA512 0b1771c7d0151706b40c5b4f2ce11e65bc099e539464a26c413ce847f7334baa01d3bc40cb899c3f3c33538dda0d82e5cfebfcc7103ccf02cbb0c13473202b83
-EBUILD aufs-sources-4.13.10.ebuild 2236 BLAKE2B c9b9a1942d23200ab18d76bcfd4ea3e3b70b03c28abf31e13e411613ea797453fa524670ecac32deb1eb403468b0d76eb560b001997abb5293d8651ed2dcccbc SHA512 4e32787fcea7ee20aaddd042d26c80bfd692968d025592455e823c3589df25b6800718870aab13e4e8a699377854f300db7d0a393ec94e69b82a56d7def93f72
-EBUILD aufs-sources-4.13.11.ebuild 2236 BLAKE2B 065b94161969514719754707d4e599cb6314d141b06395582fe8eb55e44a991139339d1752892c18c7605522499dd3b0f625214b48bc467cacce53aa7e02b2ed SHA512 82aa95fe4fe950f644af037a12a9e05a5a21804356996839ea83e570454e704ab35a781ad3309494fc65a4beb51780210df8e309583edefb81c4b154b56f1de5
-EBUILD aufs-sources-4.13.12.ebuild 2236 BLAKE2B 6e1390144e548b9563dbc03e339364ff0c17c0912fb62b496db743514973065a0fc0205bacd6a0f7bfbf070b513c6c05ea7217c4693c477c30b08f459af2acb0 SHA512 d2703d57ba7a620ac7ed9deaafe36a9d0ce305e61c4368a1d2db6b9aa2b8640011517866421e7db0782d65d0aaae0d0d4953128b63c66f8234e2b1f454819f36
-EBUILD aufs-sources-4.13.13.ebuild 2236 BLAKE2B 3dd5bb56b214938b0f803614ac2b6bb78e55f03ac01c17f432c3ece4027a74bbc75e06bcd6a224c8ccf27c21b9d1bc5e9a57d03e7a6a66ccd814e4f82afe30bb SHA512 3472debcd9c2f41024762402086d9b6c498739d2c1a007e1f0313fd167713a5b159c5168630e29484d95f6c906d207ecf097c1892f371820fc8d8027f9b4d3fd
-EBUILD aufs-sources-4.4.87-r1.ebuild 2235 BLAKE2B 4db37ea01996fd36d73a1b85e8546bfebb75c5ab75cd32c34bf78683df28332d4b5c80ca9a516bacd8b6d0fb58947446f0af4b96b30a8c91dcd954a010bf96ce SHA512 686bff5fbc4deb8870f9afc21edee4ff023b8c20adaad098ab8fefb1eeab0cec2560e79466981158aeb6085faef45b872289920ffd3e920e25e303cfe2d28d9a
-EBUILD aufs-sources-4.4.95.ebuild 2235 BLAKE2B eb633e3dc2c6e41f4b771304c18288fde4e7ff3b2f3c6fe911589373d09d6243df1c9add802992f639de4ccdcfbc5807b26eeb5cb85713623a6ac6d9b858326c SHA512 0472fbd4acbd67243d4a59bfbf2706d174c3446a8f741c92a98af3ad1808ad7b4252a5924743876ca0e7e9a004bb81e92307d6e4f4b33e15602c629247ff6e8d
-EBUILD aufs-sources-4.4.96.ebuild 2236 BLAKE2B 2b8cd665eac16fd8f1274c47aaf189f5a26caf230019e0b1f2dff0a894079795a1e18a1645f36ed281230d38c5e4fa9f3ab7c248ec0e6d3a3be66ecc583b6b54 SHA512 759a10c084967ead75020d49b0dc4e9ae1f0f28958af8bb1ff38acd49ded9b4b5151185e74deff1733c77100fdcfb2546e2ae55150eea187b01837a1c4531a5b
-EBUILD aufs-sources-4.4.97.ebuild 2236 BLAKE2B cfe43e43f88bfeaf751aadb374b19d604de5007061031db65187819815c7fa57ef75425553456fb4eff8279c20bfe3da098afea5f428b891471989cd9ca98022 SHA512 14a96a91eee0d35c3ed39b6dfc366f82e8f2bdb535d7d6e85020ef5f50a731aa322d9dbf666e1c0af7038a032d8dafd532027558f7389bacfa4658c276a9d460
-EBUILD aufs-sources-4.4.98.ebuild 2236 BLAKE2B 4f1ff8a26cb17b751a47fd92ebafd1a40b6ee5efe363adae71fd0ac9b0a4e2d7666f8d66c0afc66e3cdc0665e8254b3d3e391095c9acd37f8112b0a8f7aac1f6 SHA512 4fb32bca8c8c39ba4c544440910214e5d12f54e3b563a662d11231202e7492a3e1ad8801a3b6927d684cd1ece4ca7d0841c97554ee62b60156f5b5c7f876b5a6
-EBUILD aufs-sources-4.9.49-r1.ebuild 2235 BLAKE2B d670a5850b384d8f3d4839d3a5f0e61ca2869fe356b6d59224b4dbf1d4d548de5b434ad02f4bd89499931d15a2361a9f9b9a362d38ca0cf999b772cdcf5ed3a9 SHA512 f2968a9900eae2f9ae3309b726810ec9441348e0b40abcaf0b817145707f737cad8a34127c4628d06424863fec1d13b1ebe0285fad492c683a26d1f5502ca8c0
-EBUILD aufs-sources-4.9.59.ebuild 2235 BLAKE2B 5105a186b127844d9cf45aa5c3a31a68703ddc2f3390f39084d4bde2b8e8054368e4437f46f5fd48fb7fe6e79af7b0f06a4ad02121a08818e0d85f5d2feaeb16 SHA512 55f370f3ae501265348167b0c812363da3780d2df7083405b3c3deb987774b75ae1d05fd3c07ef39648d29194e95ec896700643bfebc2abb67d9a56a7c5521a8
-EBUILD aufs-sources-4.9.60.ebuild 2235 BLAKE2B 2a61a69f511fc44aa1e5acfd30b1abfe7a78569667e5da3c594a7215b66766be60db23d66229df8a18b30a93f9238b4ea07c5e5def07c595e61a67bc86c0563c SHA512 8a8870e478879fcd624b9d7a234878cbef6f36ef3ae0a171fa43d3d2bb6a91169649e23337001db7474f79e43289be4a7409b3a8c0785da7ac5ceacb9f252977
-EBUILD aufs-sources-4.9.61.ebuild 2235 BLAKE2B a4087585b32c19956485ebfa49e8233f1702ef01d5f1d360b482e2ba8d95e07bf77c678ff9bc866a5d19a48fbb3964f3e8118a0512ba35e9ce40c324f2fe1f44 SHA512 ec076d0260c37a1b03943b5db97b5df1aaa6009af811f7c6986743fa5cd777e7588afb81c99fc2d3bd9b2417a648db91d2e20d32375d333e24bb025e491ffce8
-EBUILD aufs-sources-4.9.62.ebuild 2235 BLAKE2B fc9d396effc8d49d00e43cac819f7692ad8c21d12573dd6441d4eae42e9a40be0a647c3a03147d17ec70f2761cbf624fd1dbde23713172b71daa231a65ba6223 SHA512 5cc1c094eaffb89776dd3abfddcfc4bb2b0d1acab53511ed983ce5e1d223767b8a43bbc0db737412224cfd52a1e6c8115f4eb71b80ea2e3d3553656509c2da18
+EBUILD aufs-sources-4.12.12.ebuild 2230 BLAKE2B e971208fb3fafc490d6e149da7237e7a9865ca3d171ef7515546790b8079bf4d2ab3f358cf2f7e0065ceabd555388032a49476280af2b9e923aab60ab2a6b911 SHA512 f3460edd57159f911576b2d58721c993a83411de0dd41c2ee47802a0a06fa8fe434ee3f2a0d7bc8acb386957cd83f81ffab3aebf062a818ae9f015cfd1ecc650
+EBUILD aufs-sources-4.12.13.ebuild 2230 BLAKE2B 9fa909db0a3bab90af5534be84565ead85e7a192e73e8e49836a8ddd4b7a558a590f1aca73538a6199d232680852341acc44756db73953fa04a2fadffbed6920 SHA512 c06e962577b688299cd40e0bd5dd82349ca35623a24df8516c999115190889fae5ae1dd57e86b9b7cf2d0db0e748c95088bfff8271983143b4f3b782c3ed1a1d
+EBUILD aufs-sources-4.12.14.ebuild 2230 BLAKE2B 878006cb91cc11f68fec829ae1bf37beaaa557632357133e11c173b4105ed897e1ddb6299d14327a06eb71f838166e9e3c41157b4c7b225d831d35fd3d51cdf6 SHA512 4de222f27c0bd5ac418a5046ba21145140a6498dcb2f42239d855eebb9da9ecd1160a76d543b3e02290f0b617a00a8966b2999b9a4d7fc32236b5080a1d808f3
+EBUILD aufs-sources-4.13.10.ebuild 2230 BLAKE2B b1efa9e6a9399240205365b330ee0c07935317d9454cf7a533e8228009570b684ef73744fd5b441fe661b6caa4041964f45ff61b9003380f19ed7fa682fae453 SHA512 c2d4dc8adf0485374b0c654dcd4d1739af028547ca2e10e94546ed56f3cb8a3e89216563cdbadd195fbbd7b1242e15699c7111b219f04a936b724e952288e4ca
+EBUILD aufs-sources-4.13.11.ebuild 2230 BLAKE2B f07abf66aa544da005ba92b67858f32a5c56547fca3573aa5862ae84183196bc087b79ae4333136a823bad02fa5e5adff866f54b2a89d804152a12ceb60d273c SHA512 f6011de6bbf3e035211cd4924bedea3d2c5563f793943296b8909b893d1f5653ccc53675f42038f0d6e4371dc172bb317d5b1d1f1bc571c3525b3e649d7d1bba
+EBUILD aufs-sources-4.13.12.ebuild 2230 BLAKE2B 72efc6f434aefe4360de92fe04ec898f03b716144a8dc9f39c8d3dd43747d3db3ef2c4a7de4b409a0d7b7f12f383780981edaf44d9edc4acb0401f139c6c082f SHA512 2aa890e24956de33602f2ddc1b51e36e2fe97bcd422f094858db9203064efa7b4be4b16dc99d8ab2b9459a16929a156a7ef687af5bcd01d9b19f9490f5861f48
+EBUILD aufs-sources-4.13.13.ebuild 2230 BLAKE2B d25e486913adf95033af777d5ab8896efb519645430abc49c5566940f9c63b7b40c80059a2dbf3dba9a3a71c696db0308a75f74b6628652e27cc1670b3f057a2 SHA512 7560134b92958c8c0a9bba913ce95bfefb48b46c2733f581b88664cb634aac8d6f26e217152fe9fd8221ed8667d58ce68886dc09bb9bf5b768d943d4e0d4d93d
+EBUILD aufs-sources-4.4.87-r1.ebuild 2229 BLAKE2B c833f0bdf1e89ee3f3a3258de89a4e53c1d35cd7774fd2e93e1ce0cc532f6995f4ff99d1df83de37acd82fac150fd7f305b08588e4b48727ac865b5758889381 SHA512 f6caec63aba14857d6992cc9d2edd2b6bc345c93a2ab36efe6b87e5d6412c295d64d4777bf9174a71d3fdecaa90d5af7596c66343a2b875d5be1b6d1e64971a1
+EBUILD aufs-sources-4.4.95.ebuild 2229 BLAKE2B 37b7c671f764d74bd6fd6c6a94a2975b018b8a79440a699c51f561b4724293a3e9278600137958151c8b27e593b189f3b474f4897afe7295498bccc8718734a8 SHA512 4d8e5b01d3ca4bafb49330a5823bde20b75b415ea2fe4fa0b9c9c49f674a3b27bb7df5410ccfd29a6a12e4acd19d127b06f1583f063ad1e78c0925f1576bfd3b
+EBUILD aufs-sources-4.4.96.ebuild 2230 BLAKE2B 36bcad0d3d0b5cde70c84c49988f9bd96086b617881df83bb26e02351423a6fa6fa0abae6381c02638c0cc166ef147c77f10a207d354ad8c7d308a6af3be5de3 SHA512 0cf5e83c3a8cec0d0e7ece1ebeb7a0f73aa8f2f0f7df7709aa9aab856a3bd6eebe402ba18212bc6609d4376481bacf95dd9aad5dcec41ce2d3d9c29ef790d217
+EBUILD aufs-sources-4.4.97.ebuild 2230 BLAKE2B a1e3a869cfb00742a170c9803450de3fe2a2686eeb9aaca27be2a97b7b8be61bba10f3c37d913364e4bcd0a537a217d21c87408fe82d80eeca0ed0366d852b2b SHA512 9a1c0ae1ea33bfc9ff5777b872d009f66ccbc6ab49dd95b8e27c3d91f84f19ddc551e1f02c8880074dcdfbb1eade4ed8e4d336065c066c5526de0efc6376ada4
+EBUILD aufs-sources-4.4.98.ebuild 2230 BLAKE2B 7e6e7d4493426aeeed51b042d57d4aecdf6f15f86690ec00c8deef82caf93cfcd81c26a3df0e1954b9c6e9bc4701d34111fa9788b6d25b127bd45aee4aa180d7 SHA512 efd8fda116f9e6ec39ed26cc87dddc8c84cfd51886e0339698d76278762a3f5ad1914149df815c3d235094806b0e048947ab8c69eb6c9ff30919767a1f714464
+EBUILD aufs-sources-4.9.49-r1.ebuild 2229 BLAKE2B 2b551c3767df65c6008704f6e4c0beee15b26fc255e5f11f126b8f82950dee9c6797d7cf216898c3e4b50b3638fc7ffa2b77721611db325138e08cbb9cdabc70 SHA512 5c0a4dd8fce85cf8db60366e3bb8bf851310e00f02b368890e7f2cdda8ec8adc40791e77160081ac664ab86a8350d1508783f8a738a11bbe12e0c31e95d2ed9d
+EBUILD aufs-sources-4.9.59.ebuild 2229 BLAKE2B fab6c7cc538151a1ed31a3c9a402c258c2116d91b6a08469d4819e7db956f3cae21b35fabdec4f69e53757242db9ade127d891850528f2368811fed3c2e44a52 SHA512 35f657b3725669538e8004990199d9249bc80fbb9e20196497fb1b701f05ea2248fffe1e65bcf25df88097fe6839f8361aebc62adb8e7685323198864f23bcc9
+EBUILD aufs-sources-4.9.60.ebuild 2229 BLAKE2B 7eddd7f07494050b9806d600d3fe04e10a9258c1c9d8b0caca565de738a82441cc982f224dd674d53f1a8f6fc1035402dea27a23153d1cb55c36614cda1c4a2a SHA512 ff7209b494fb3cc0bc0e224b0c6ac031038a59901cdbd548b107163ff829571862bf5408aef2882bae81db55b77744d99d440b89ca00c18519d5798e3d7a4131
+EBUILD aufs-sources-4.9.61.ebuild 2229 BLAKE2B 3f9a9f33ae0383a3e90f7fd4ba7914617c5de0e4083c22a7b85fb8fcf66c2db359cbc28c7391744fd187a5aab309330998ed3fa0a6d14bfe893e0f36475db182 SHA512 52b7a71363711a3ab60445137699fbb169613af20afacdc5d8913d56df28270d7c90a39622bda0b5376d28f37945f0e2b5b39a1d522740a709e41c07c2b2d85c
+EBUILD aufs-sources-4.9.62.ebuild 2229 BLAKE2B deafc2c5284bb56217cd5df1e7c64b6f31e205ee59bf753ed5cd63448d0b56d78974322d804946c73acffa730001c6c1cc06a917daaf3cbc39b689888a8b7177 SHA512 eabaf6012775e21381e68a0bee41d1cc234c2622ad5fef956c8d7d60d5ef8f91aee30aade88e8c8186cbdb41e317da72ef3861c2a5accd8892b4a77d27b0a276
 MISC metadata.xml 786 BLAKE2B 4a7ec566e14be79c65ccf8f9b04db4c66ef27e0940af8d3d870a3f08d96bbc8987836100aff699d90a5564a1986c929af02b9cb00553ed3f400378ca20f41fda SHA512 95853521c2369a4bfa752be73e2e7e8e5665e790a5763c7d347da1762ac142fd6caec3e20f7d31f58c16f3a38df6dfcca63b296569b7131dcbd72eeb23e9d3ff
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.12.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.12.12.ebuild
index b3201f57473b..3e726888bf5a 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.12.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.12.12.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.12.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.12.13.ebuild
index 55b1f2a99c3b..f18f5fa07435 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.12.13.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.12.13.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.12.14.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.12.14.ebuild
index 3b28062d8065..900d83fee87b 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.12.14.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.12.14.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild
index c4483119c84d..aaa490ca5c03 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.10.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
index 4ed2e322586c..aaa706e05c90 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild
index 27157d5eeee7..21456562ed8a 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.12.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
index f2d45008bddd..ce40897fc9dc 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.13.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild
index 48a7dd858886..3f86314bb679 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.87-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild
index 8ecfc6baeacc..246c785d1ee6 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.95.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
index d74e2010db13..15e42b635669 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild
index df8453657cd6..7e11f786ae80 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.97.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
index 23423f27b301..2a4cceb68208 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.98.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild
index 918a9052d2e2..e2cb8eee6606 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.49-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild
index 8b0034f38155..7054a822a023 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.59.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
index 187771acc432..17eaebf59f76 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild
index 9b05f2c940d0..97c4cfbaf436 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.61.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
index 186e388fef96..252b9c7507ba 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.62.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
 IUSE="experimental module vanilla"
 
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+DESCRIPTION="Full sources (incl. Gentoo patchset) for the linux kernel tree and aufs4 support"
 SRC_URI="
 	${KERNEL_URI}
 	${ARCH_URI}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 8dcd8fbd39e9..2da0ca2dec3a 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index 88f11504ad0b..4f736d0fe100 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -1,6 +1,6 @@
 DIST libavc1394-0.5.3.tar.gz 355976 SHA256 23c96822df4edc90e3da0f19b69d31fbf7c28d1aba393be387340a71460424a6 SHA512 36761830082c0040708074eea8124c2eb027e3bb80fdbb8978af5eabe655afd2e6c9d7fc2aa9d4aba4d4d218cba9fa41fa6079119a9e460900b1e17effb4c145 WHIRLPOOL f001090b91b10baacfe0d641ed8bbb511ccd32f1fc158d39f1ab663d37809f67e155c2d157266372693617e692c76ba2b58971759c9fb6c67662b00cc34c9052
 DIST libavc1394-0.5.4.tar.gz 341679 SHA256 7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a WHIRLPOOL 87d77193635c1fb4ce7b6b3547566c41dada6b0fc1acd522c93a582a6bdce07d939d171269475d8d5a9aae0bc84c2326df5c3db5378aefb9d60df988b907f09f
-EBUILD libavc1394-0.5.3.ebuild 587 BLAKE2B ff14dc20075ad6c7f8424a895b216c1baf87eb07a6d97e5c584d211e0ca7b2af61b4cfdbc986d456c36a474e481a47dd38db396a583c2bce0657af769ff074fd SHA512 37b8a588da58a908ccefcd511e2c2b9ca55c36c89a1d0774940c3c76daf0cf46aa335d21c65b5914f63639fb9d83cbff564ea741f67f6b98bce90afdb3d068ec
-EBUILD libavc1394-0.5.4-r1.ebuild 701 BLAKE2B c980d043a63601d565819c24c1142b9ed705342209d053bc36451facc598d379da717198d8e599b41999d33216b4d67675786990c60ac3eff6f421505550f949 SHA512 5841419128c735430541a51442663243c7fe644b7868db7d80e62726015d52fa573a6a23926796796e20aebda7c76f95ecbcae2868c852a4b5db78d2345de5c5
-EBUILD libavc1394-0.5.4.ebuild 539 BLAKE2B 9393267e9cda90052c4d62174f13617714ee593fddb6f17584837562d8dd9fd69c8a857d57a04bb87629e3049a3e5bb3b9deea35b7d9cfbaf122094d6c16a7e5 SHA512 fb5bf3bb7854a9c268dfe9ffbcd0572cd08a5adbe9f2949d94e4244be7e3c77ae6bd0fd30010a3759c4dce6e542678892b11059a1e44aeaa570d7ec0544c0150
+EBUILD libavc1394-0.5.3.ebuild 569 BLAKE2B 02bc0dd648384b7b50bf6869030f28ea32bb3af7c75fda77348d567be88eb91306ead9578bd0c4b6b47c2547e2d675236fce33db40f1832987a891a4d20b2125 SHA512 0d142d7bfe03ad1b36739134022c3e71074460930eef2c63d3a15fd0a9142f8da44093c708160ef1b6d34f0fb96af1429805b94384ce3c960db1a4d3f7acfc57
+EBUILD libavc1394-0.5.4-r1.ebuild 683 BLAKE2B 08ca86a7427f8ea55d2ce0ffb33d226671f27ab04406a4a07f85cd2ed5c1854311a9c0c71230165457b4d403e7de7993df341b275538d7f6d525a5a8759692fa SHA512 f40d1b6363e59b7222c54b9f1c1edb72935a53bb342bbbfa5175b0151bb943f97856bbf551ffaacf6a28bbff35ca49fbb42487171da0324bbd1b75456b22ad42
+EBUILD libavc1394-0.5.4.ebuild 521 BLAKE2B 0c5744eca4495eb36276fb3d6fe11dfaa23e8d71c858ba56af90cb1c266c9bfce85357d3bae3fcaac94e2283ae8dcbaa7ed4a18ecf62cb85492a76e1b65f2158 SHA512 e26d7552acab1a7c8c3552071dcd3e7f7426f1d2de6c40054c3e984e857c629108a3f67e78aa13c73f2ea9998dabc885902910fcf344581b447b9895d4da2533
 MISC metadata.xml 330 BLAKE2B a1bbe65ce97eb3a0c038333183e4fde5b7f0f0384d2fcacb78c569f6df4afd74cfe8ab34c9404daf7bd0870b983372bc35d3e3dd3ac50793fb47fe25b509a9b7 SHA512 3b2a188bb90d59ac6acb66b90e0231db783a6364f4e91a955df28346422061b99837ecf4038f6d42eb570630029623797c0e874737151065343b63352bd082f2
diff --git a/sys-libs/libavc1394/libavc1394-0.5.3.ebuild b/sys-libs/libavc1394/libavc1394-0.5.3.ebuild
index 359b39a142f1..8b8e455c2a6b 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.3.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"
+DESCRIPTION="library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set"
 HOMEPAGE="https://sourceforge.net/projects/libavc1394/"
 SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
 
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
index 20e6da0e2287..cd8892d47731 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit autotools-multilib
 
-DESCRIPTION="library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"
+DESCRIPTION="library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set"
 HOMEPAGE="https://sourceforge.net/projects/libavc1394/"
 SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
 
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4.ebuild
index 9d33d1a8038f..28d1a6bb81c7 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit autotools-utils
 
-DESCRIPTION="library for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"
+DESCRIPTION="library for the 1394 AV/C (Audio/Video Control) Digital Interface Command Set"
 HOMEPAGE="https://sourceforge.net/projects/libavc1394/"
 SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
 
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index 5172d3e4b4ba..2e0577559164 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -1,3 +1,3 @@
 DIST libchipcard-5.0.2.tar.gz 736107 SHA256 d0968594c8ed0fc4cb6d681a74a5f000b48b0ac7a9375648b57d397ac49c1808 SHA512 82c9100b31086900d3fc66f9b04eb7f365cf09b65959e06dfc7927f2e8328d70d64ad33b40615cc382321dfd50720e721198c0308668a27f1a2db9ce46a292c9 WHIRLPOOL d3ae36e3545b3cd9fc89648178fe2cea7e6441ec6be43837f46d2c16aa3b2908a0ea01cae48ef42559cbf346fd7ee037f3fd26450695283da92e816c5e42d6e5
-EBUILD libchipcard-5.0.2.ebuild 1090 BLAKE2B 47b1ee197bb1aa9381612346ab3245cb93a776d8fc8c1e52fcfd2b889d7b788605a5fcb71c3c9c07a3b2325876dfd9491c7dfaa58e83b6839c17fa21741d0e08 SHA512 a3088ec094ff279e7ef2359f9eee04a7614c437b7df2d715b1cda886d83ec6649674b2d394ea1a1fff8580b07ff7167cb28672fd61af129491fa4faecfdd33dd
+EBUILD libchipcard-5.0.2.ebuild 1068 BLAKE2B 52ad30834d5264ed73a7b751596442f00f06d83cd2b4b5ce65eb98dd4b989a99fe7c37a2cf8ce37ef3a001cdb4650d19ce3e1735c4dcf93eb4e1f4a6cbc3da17 SHA512 9bc417741d172f9a2065f0636e08420f274957139ea23f48c9175d1ac27c079a2aad2efb905033c0355f690749f57060f55f65c18d29c8a15157b6669e78f567
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild b/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
index 5907e46195b3..eda40089b65f 100644
--- a/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=2
 
-DESCRIPTION="Libchipcard is a library for easy access to chip cards via chip card readers (terminals)"
+DESCRIPTION="Library for accessing chip cards via chip card readers (terminals)"
 HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
 SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=02&release=26&file=01&dummy=${P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/sys-libs/libmath++/Manifest b/sys-libs/libmath++/Manifest
index 65103dc93b06..b1a277534832 100644
--- a/sys-libs/libmath++/Manifest
+++ b/sys-libs/libmath++/Manifest
@@ -1,3 +1,3 @@
 DIST libmath++-0.0.4.tar.gz 51107 SHA256 9bfeb340a1331d53b43fcd0f0c3aef0b985985ee9bfffac7c42eb57405db3414 SHA512 4ee86f365f9eb4f8a122beef430041b5133da1b780a595627ec43c53bb45a6b5a5836a1f2453d2c93f6771ff45683b1143a1d1432f3904ba5b6317c50f010bbc WHIRLPOOL 47c80adcfab7fd0599fde2a53d71c297dfa61bb7b19a4e9fd6c6d486c870aa28135b3b1be6a09836ac36fa4aef1f4ff37f81636cecffc562cfe10a0884f2ec76
-EBUILD libmath++-0.0.4-r1.ebuild 1068 BLAKE2B 67de3b13c59c9f8b9caa614469e1f28aa14494af8009779f8200040aeee9d52c92b23983bb723411cd4c4edd1303507c1645084d42c60015f777d87bc5d3fa60 SHA512 92862df579342654e69a54990b31b82feece5d2eb80492313f9fcebd9294d996a83efbbbd00a48b3770558b38ce57a5ba1892c4ddc34b40f4649afca5c272a8f
+EBUILD libmath++-0.0.4-r1.ebuild 1050 BLAKE2B a46477d2c5c108356db10d9b816563b4793b42003de3df577db7ea624e68edd12bd00835501b61ef2bc0065cb83fea840a2a184451810e5a86fe532299c16225 SHA512 8fc750078987c8c48149981b93166efd71a0b7e8655496e2912f6272d73ead783daa7975392a29204b929c22a0a278a4b70d3c9c49eb80004caeb3e7850f1545
 MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild b/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild
index 51c67b20bf19..790fb2088a69 100644
--- a/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild
+++ b/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild
@@ -7,7 +7,7 @@ AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1 # bug #474098
 inherit autotools-utils
 
-DESCRIPTION="template based math library, written in C++, for symbolic and numeric calculus applications"
+DESCRIPTION="C++ Template math library, for symbolic and numeric calculus applications"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
diff --git a/sys-libs/libstdc++-v3-bin/Manifest b/sys-libs/libstdc++-v3-bin/Manifest
index 914e62930356..a2c6137e5137 100644
--- a/sys-libs/libstdc++-v3-bin/Manifest
+++ b/sys-libs/libstdc++-v3-bin/Manifest
@@ -1,4 +1,4 @@
 DIST libstdc++-v3-bin-ia64-3.3.6.tbz2 325449 SHA256 280bd169f7c2608cf102d296be70a71d0d2d20812c2b35c03d17ca11e841708c SHA512 c20dba994af3d5e0a2c85c9599c7ccc0260a105330ff6337030928c81e8300fe3e84925fe815d3bf42d050402b69490f6762fbd8ff9225a4621fa8e693c7b63a WHIRLPOOL 6a42e2a18f774dede0b2a186146619c8760f00baae44d30fb62b33e38b9fbdc3abed0a64964813c6bd5dab17978d05304cd4169cb42f7f3981da98256f841550
 DIST libstdc++-v3-bin-ppc64-3.3.6.tbz2 301670 SHA256 b0e62a415f57e8870049fa6ca4f8d56aed6fd2359782b178d0e9fd1c5ae9d1a1 SHA512 167d9863e6c54a6e85b2fd36f46f8c5269679c47f1ed50816718c502836bdefdc52949295a223b2870935bc1aca23a2c9fb967d51a02ba278d269b70cc82a8f6 WHIRLPOOL 41656751218576c94934477c9b30cd9dd2e528a6dc7e5d328ffd9e74b2b600915618c67ada0b2788f2cb94dc13aa71620ff0fa996f529fabe53bac48735c2115
-EBUILD libstdc++-v3-bin-3.3.6.ebuild 556 BLAKE2B 9782004c7089918bbeb2c8cab0ac1c88c9e535c4e403d50ca363b97bdccabcf2668c7ca9536b989ed062958eaba25f663bb04713eced1184713b9dac2a9fc99e SHA512 dfdef71a2e46479f82c8fbe945ee6b47f353159fd63ee4ecdaf4b8b521683203e7f7cbb22d3d7af31c4f5c4a43da0b0adb6c0d885ca96d12d1d3382207719cfc
+EBUILD libstdc++-v3-bin-3.3.6.ebuild 553 BLAKE2B dcfe2ab5506b1d45e255b14ae60443e3a5fa0aede4f3cf473f365f1a6e72977b2895b9fe3e87d981a09880983107f454c3a6c31910d4c6f7256d2385f9fcccbf SHA512 5206bd86e5f3f8a085354ee4951a5a76de0e5df7d0d33db59daf665fe1875378b6eb8c3760fedd4a1dc000f955391b1475d33fa9739014cd1d7c1297e23cdf4f
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-libs/libstdc++-v3-bin/libstdc++-v3-bin-3.3.6.ebuild b/sys-libs/libstdc++-v3-bin/libstdc++-v3-bin-3.3.6.ebuild
index fccdd1264efd..dba2ca1c4a26 100644
--- a/sys-libs/libstdc++-v3-bin/libstdc++-v3-bin-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3-bin/libstdc++-v3-bin-3.3.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DESCRIPTION="Compatibility package for running binaries linked against a pre gcc 3.4 libstdc++"
+DESCRIPTION="Compatibility package for running binaries linked against a <gcc-3.4 libstdc++"
 HOMEPAGE="https://gcc.gnu.org/libstdc++/"
 SRC_URI="ia64? ( mirror://gentoo/${PN}-ia64-${PV}.tbz2 )
 	ppc64? ( mirror://gentoo/${PN}-ppc64-${PV}.tbz2 )"
diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 696cbfe0e043..4aa4f10dddda 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,3 +1,3 @@
 DIST libutempter-1.1.6.tar.bz2 15705 SHA256 b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede WHIRLPOOL c94d42d6929754608f9504defec3ab5b4c5c61fd0baa373e07508a11167241c07de4ecf26e14271e2c9914b731afba12ff7930e8ecd0126da1f472dccabdea30
-EBUILD libutempter-1.1.6-r2.ebuild 1739 BLAKE2B 7088f6f8daf9f5921a6f0916c1c2a1df8324dd37f92ad21e861c1266e5fbb4b622fe16d1fc488d6dff402ca22eb40f8d2a693607b8a356fd5da9afa209791a66 SHA512 fb296595516373403d65637b6162772b0ca9e211c26829603182415dd283671bfbc9c81983fd790d876244716217c80f950dab65417e125161985ffa55df34d6
+EBUILD libutempter-1.1.6-r2.ebuild 1715 BLAKE2B a847fd169249f64c2e9bedde76104312888c77d2209bbaeff8721328bce750453d4f6b242fd0cea529887b5498eb634864b07d91dcf230840a10932ad073375b SHA512 c676609ba44f0c5f167078746808b0224d05f6c6a64aa981ae42129f5f57712628bd04d512f46a68ef10bcf316894a5d7678535a231de4744f26a5c659ecb92e
 MISC metadata.xml 344 BLAKE2B 090f0e14a3a7fec427cbffa3abc85b6caf242a4f471358ba0614a23682a183a2ac93fd4d6695ab0059b0c7e5573d8429ea4600506050753e2ceca3c1217c394a SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
index f64862b3abc0..a4936c7195d2 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild
@@ -5,7 +5,7 @@ EAPI="4"
 
 inherit user multilib flag-o-matic
 
-DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info, which need root access"
+DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="http://altlinux.org/index.php?module=sisyphus&package=libutempter"
 SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
 
diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index d84c71209d7f..ca992e8a0e17 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,6 +3,6 @@ AUX slang-2.2.4-memset.patch 1054 BLAKE2B a4d013b70719de8ab92fbd04afbde87b6be519
 AUX slang-2.3.1-slsh-libs.patch 761 BLAKE2B a0bc1a573fa1031e44c998bb75c80113ccd86be47f7d0b80da0ba53c7fa066d780ebb86b9cc5ff503e0d4c99b49fe75cb4c916088cc7b18a5a6c1670cbca4ba3 SHA512 77516f0b0373a08fbf61765e4eb83cbfa91b29a58a41e0006d1041672c6107dc5a2410056d65dd64fe68de40e01c211feb9f748a8238473cd5c98dfe2125f7b2
 DIST slang-2.3.0.tar.bz2 1532986 SHA256 f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129 SHA512 0b04d916409c59f66301877c078bcca63c8b71e5dfa6c1d804353e41949bca16e664a79381c4156068b1f878c333e618f1de165e4059b09831fa83a794613050 WHIRLPOOL 395dc36d2f571ed19d88ee1f1c3594ab50d3a955949724d46582191430aa0c23cf3f78f966b184f3220ab86f2939e4601821160455159783793df30597c53257
 DIST slang-2.3.1a.tar.bz2 1577749 SHA256 54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36 SHA512 e7236a189081ebcbaf4e7f0506671226a4d46aede8826e1a558f1a2f57bcbe3ad58eadeabe2df99cd3d8bacb4c93749996bcbce4f51d338fc9396e0f945933e7 WHIRLPOOL 08ff5cf3e72e32a603f1f87f20767ef96a7cdb02579bde16e45478cb4350e4ad22d4a3ec39b367deb7048a65e25e9774184e2cddf5a01aa6c22317984283b8e9
-EBUILD slang-2.3.0.ebuild 2293 BLAKE2B 1d9414c668ab21d24612bac6c97fd2477a369fcc15a6084a6c9b81a7625622f16af5f242537ef9298386f98354c3f9720d8ff815a3c1fa963372beb958fef02b SHA512 6ec3a75d32f79cf003ef60ba2fb5bd269ef9414a846eea029babe27079720be3b50765d8d07f81cd0c346bf22dde7422094918ae0a598da757d47e44ff2bba6d
-EBUILD slang-2.3.1a.ebuild 2291 BLAKE2B 68d2324855e92471c04233dc65508c49436539635a05d45c931049d0ca3c6986c299a3a658882a6c511b6ce39144d59cf5de50b79527f8704536411872543a3e SHA512 bf22bb6fa9a108380cdbb5a971124f140d56c10e3b777d438ce9e1e9f8acce67647d07226ebb4f8edd299ae7268e1b4a212d12c94d6b3684bfdd625ec79102c9
+EBUILD slang-2.3.0.ebuild 2278 BLAKE2B a80f356174cb2b2fb281db115bbcf4d0ca837c01778926165d282c79d12a93114ef9c4bafdcad2625ff9959404015c8eaf05a4d9d8dd17f164d979b6a30969f9 SHA512 698dc02deb7f95242f9921a03097699bc53311ad55cc5a4483fbe02eaa257ca3c0937ba222bfe109dd5de3f415843ba674cea0d729aae8f87def395a187cd475
+EBUILD slang-2.3.1a.ebuild 2276 BLAKE2B a68178e079210db4f5acb4c4982572330121da7b1f993b43380cd2173e524b6513a70f07c5dbc0e69c40948cb21a78fd68a844830a1471a1305157428bc9ab27 SHA512 bde4c819e1189fb82bf1d1a2d4be5f475888d6c2687b672a9728ea7561ce56601836e169ebbbffc97a3c2bb0df496b220fa1dc6485c29239685fb37dc23cae93
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/sys-libs/slang/slang-2.3.0.ebuild b/sys-libs/slang/slang-2.3.0.ebuild
index 3589c61994eb..ab491005f216 100644
--- a/sys-libs/slang/slang-2.3.0.ebuild
+++ b/sys-libs/slang/slang-2.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils multilib-minimal
 
-DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
+DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
 HOMEPAGE="http://www.jedsoft.org/slang/"
 SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 	http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
diff --git a/sys-libs/slang/slang-2.3.1a.ebuild b/sys-libs/slang/slang-2.3.1a.ebuild
index 96347bb2b788..9464375362ea 100644
--- a/sys-libs/slang/slang-2.3.1a.ebuild
+++ b/sys-libs/slang/slang-2.3.1a.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit eutils multilib-minimal
 
-DESCRIPTION="A multi-platform programmer's library designed to allow a developer to create robust software"
+DESCRIPTION="Multi-platform library designed to allow a developer to create robust software"
 HOMEPAGE="http://www.jedsoft.org/slang/"
 SRC_URI="http://www.jedsoft.org/releases/${PN}/${P}.tar.bz2
 	http://www.jedsoft.org/releases/${PN}/old/${P}.tar.bz2"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e570eeebcd51..f9283c41b632 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/jpeg/Manifest b/virtual/jpeg/Manifest
index 11614a245022..9e057790af32 100644
--- a/virtual/jpeg/Manifest
+++ b/virtual/jpeg/Manifest
@@ -1,3 +1,3 @@
-EBUILD jpeg-0-r2.ebuild 686 BLAKE2B 99f1f798816ebcc358c3b7315890922437182815b6eaa56f7eefcec6d1ac4ec4ca6105d454a65c92ae8248ba7b67673f9d2207d9d5d6467a0105ca3cb6dc3473 SHA512 bbecac9ee040af49d6919d2e328e54dcc454bbaa291919d03524da3af0bbe0b09ed6b56a3f9f133cc9a2dc0b3c49807edccce67ecb09f0e94ffe1ef59cec4dbd
+EBUILD jpeg-0-r2.ebuild 680 BLAKE2B 9740d545c0aae08b412bbdd2f81cc6aa4be9a504a14274774ca1faf64b1d8680d12f62f66a9c7e6231e7779e61d4575c626d5df6fe6a7861b6ea1c62fd1f4ec1 SHA512 d93d2642556ec0fe42a405dabd8567f6ed4acc75ff6694a523b0e10c68c9496a4de7a209781c2591fab22b7ed20f4ccd5e47b545235e84184cf52dc60d53b704
 EBUILD jpeg-62.ebuild 608 BLAKE2B 3fc7d0baf2f7e5ec7062ca747f587c9c928c16ba49f9ecf0cd47758db180537b81533d3f3e97c3b5834b013442c226e0d290621a34edf1261fd4eb80b4c4c27a SHA512 ec0d0e7e3996ae1c775c5b20fc303fd633c0871b30cffb3c654d6a997cf2a0e2167a5b2f96dce709cfb6ec836eeaa831fb0f4f51e08a32a7e091485bdb5a10f7
 MISC metadata.xml 478 BLAKE2B f06a20842644632f99e96760fd86828c19c43eb8eeebe63e3d33270ff0dbf2691a4308e6bc02287c986ccdfde72320bbab98b978cf33063f8f009dc6ae29dd64 SHA512 0caf26a58a2888bc999a1728c8cb06a913669913633afa381cf9777d44cc46a910d1fee9ff70228c84a1cecac2aa0146e9dce3a04f43697c6db42e8dcd348bc9
diff --git a/virtual/jpeg/jpeg-0-r2.ebuild b/virtual/jpeg/jpeg-0-r2.ebuild
index d20c8f44a648..66fbaf1652c1 100644
--- a/virtual/jpeg/jpeg-0-r2.ebuild
+++ b/virtual/jpeg/jpeg-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit multilib-build
 
-DESCRIPTION="A virtual for selecting between libjpeg-turbo and IJG jpeg for source-based packages"
+DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 96b6ca28c98e..24e9c182dd8f 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 2e313dff07e4..35574ee62a0c 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -1,6 +1,6 @@
 AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00a64c0c939661ed26ad38563b833bafc1266d0b5c5ea8c2d0e5804547b73d5d2b7d95c5fc3f37411715db SHA512 cafa6b049f4131b3cb43a4c62a6fb06e9ac5c44bea1901865dd5d48692f22bb5f6243d812f7f2b2d2adf0d39a16480f062043556bedc740b5630809ba9c972f7
 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 BLAKE2B a44ceb09d6003deca62b69a5237d37a70bc7f5532a23e8a871b61e6c95249bf92c40d41c8fbd1abe4733f2d43ad7a27868914d48f3d43abdf3a2d84eb5d2c4b7 SHA512 90377f614bea6c8689be1f6e26d94e9ac3effa43a143366f4c6c2bbd363d214252ef4e35fc272eef74cd1776cd08dc889dd5013ec6b7641d53085b211138275e
-EBUILD mod_gnutls-0.8.3.ebuild 1038 BLAKE2B dc8a38c65e37455cf93d6bef758172ee9e29d19349c896566497385b18eb6a7cec12b44b84e4480d87954e5564b0a831273c0ef2dc9b79ea09bf1f4fd9d8b479 SHA512 3f668bea52e392c63ee51818e0ba05309cd5e6ceb746dbd98bf8a6b809f92a1d16f7ff620363916a3e2026014aa83144f20f10d77a5acab27a7b1e0b41c6f00d
+EBUILD mod_gnutls-0.8.2-r1.ebuild 993 BLAKE2B 8fa3ad55f2349ab8c3d0eefe011b1f1701e05217a16bb9348395f653f3952438e88b9b61b9ed98e0aaa20b4a28b53dffac2cbf9df22970a205cb4ac9afd73766 SHA512 c9b1a3fc316997fe25aa37317b367ed2bb1a055a8234eb9cfb299f2ea071ccca69e91fcd31fbda21dc097d4dffa2ff4d769186bc6ff76cc14c9054ccd0486b6c
+EBUILD mod_gnutls-0.8.3.ebuild 1029 BLAKE2B cbba6b7f50373305ff0a7fa71bf9dcf66b648a71f521df9f96bda55232c9622fca7866e4c7a50d73945f25193b616ffb7a0c44afc70b964d7b5c0f7dd32d01e9 SHA512 55ccb5cb7f826586be8917b3d879d03b4f482bbfa5415e0954618b523426e710a23bff1bcdc3b0692dc9ffe4dd723560a3a5aff68f21bdf6da90ce93241173a0
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
index c85c93b2b0cc..3576124376cf 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit autotools apache-module
 
-DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
 HOMEPAGE="https://mod.gnutls.org/"
 SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
 
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
index f559ac1fb5ee..e92da3628303 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit autotools apache-module
 
-DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
+DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
 HOMEPAGE="https://mod.gnutls.org/"
 SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
 
diff --git a/www-apache/mod_xsendfile/Manifest b/www-apache/mod_xsendfile/Manifest
index d9c1eebf4cdd..b10def4a0691 100644
--- a/www-apache/mod_xsendfile/Manifest
+++ b/www-apache/mod_xsendfile/Manifest
@@ -1,4 +1,4 @@
 AUX 50_mod_xsendfile.conf 451 BLAKE2B 7bacc1828434238520af0fde4f877ba64277d515f3abd7bdc8e4ccded1ec5ec5556fede98d02ffc2aa96ae9840fa3dc68a110bf81a6a09487e265018cacb50f3 SHA512 b138d82adbf2a145ff5bef22750826eabe58daf94eabdfebd8d540be4b9b242a69b9ab9333e0ceb4da0cbad947978e7bf928978b6cf8560abe5695d6b533df3c
 DIST mod_xsendfile-1.0b1.tar.gz 14883 SHA256 4646d6dfa0d57b2a45a9881dcf932c065e712f68effe649e3c7903b16103f98b SHA512 96745a5c753af329cabc10b1551e199425abf28c058222e118e67c604a53cfebb4fd8e27558caa58269ca8b4ca805ac6c4a71654c8414331c095bd600a4b3914 WHIRLPOOL 7aa9294b02951c1f1c617d497f655fed15c7651c061622012b9a3482bb9f010dee809b63777262e2d3faca2934a3721c5e8128780dcdd6fe96d032ab03cdf846
-EBUILD mod_xsendfile-1.0_beta1.ebuild 590 BLAKE2B 557f990858cd97e80c4e156bceb923ed8c1bca630511a29bc2ab72ff8efa0bfa1f3f30105530fc1a563cee22ccf735039997ffe3158c616dd3f10c40e8a8ebe0 SHA512 4c77da0ee71dc05e89a50acbbe252fa1f9c37866a9ea608c59eba4dcc1f1570e163126fae694792943e92aa80bb0778f229f433c4793fba1a477f785ceb8e1e4
+EBUILD mod_xsendfile-1.0_beta1.ebuild 580 BLAKE2B 9cf32e64c43e894c04c9ce8e808563ec36b33c6a9bf549c96d7b346b677548e414d4fd3da535fa6e74d0b4a42ea64c629b172096d772209fd78d1753f67e0b2a SHA512 8f784038f9b21b8e9b39d7eba09e98c76610b91367ca9f8b194dbe0d6aa7aa3ff9d5ee8863cb2c5549b7b53c5d53328c020bd40c6368ab925f3a3a4515f85233
 MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
index 0467c9c43a25..b6b79a6db6a7 100644
--- a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 inherit apache-module
 
 MY_PV="1.0b1"
-DESCRIPTION="Apache2 module that processes X-SENDFILE headers registered by the original output handler"
+DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the output handler"
 HOMEPAGE="https://tn123.org/mod_xsendfile/"
 SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz"
 
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 02f02a141885..9d9a37da0fed 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
index 9031bdb8713b..f0f540ea9d50 100644
--- a/www-apps/blazeblogger/Manifest
+++ b/www-apps/blazeblogger/Manifest
@@ -1,6 +1,6 @@
 AUX blazeblogger-1.2.0-bash-completion.patch 2058 BLAKE2B 461fc806002d2c6075248c3291f6f6f0d68674a2ea9b85a9ded5182dfd86403e72978000cb8c3c84d583ef6137a919b8093f4ee812946405bddd8a68287ecd3e SHA512 f69b75f16f87c3cf7e16765eb6f237a6c32a046244770b457a94a189a9d2e612933907dc43143a86167252b0a51280eab045fd3e9bf92a00cfe3519393ed9db2
 DIST blazeblogger-1.2.0.tar.gz 81340 SHA256 39024b70708be6073e8aeb3943eb3b73d441fbb7b8113e145c0cf7540c4921aa SHA512 c0fb7d3493933e405c78e871baa0eba7bbf6245d98174ae1f80d215bc413a836a0872fef067ca0622bbb155b54d90e7e81d99e6d10e93aec3bce098677a827bd WHIRLPOOL f2372fee786c84835e33dea5815b27a34d661be53f5b1b9499c1dc098c03cace057522095d580e53d7916779bf208ff56f6e8827b9ae15ee04ff9c3332c9289b
 DIST blazeblogger-doc-1.2.0.tar.gz 191467 SHA256 a1591f88b245114dea421268f0c4938f1c1a7fa0ba94316f886e0014e20736bc SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989 WHIRLPOOL b64278305a68f74b4185df07fada6ee6dc2ae2fbaf9985f810803893ec0f2ae2b788b2e1fc7a9baf6e4944b740494bb45951c5c3ccc92c144dbaad524ef03f25
-EBUILD blazeblogger-1.2.0-r1.ebuild 841 BLAKE2B 629c0d8bb163e346184e2b7059b24244f8e5a702b6a597919a744b633147cd3342a9e28f96b0e45fc99b57da59b141fb7437a8b0a21e84fbbdbaccab9234c2e1 SHA512 aa86c2bf7f9ec3f90c09d5298412db64878447ea971792336c6ff94fc57eb50ea5a8cf9b0c9213d78c45dd621922fd9ef97267d1f2c86b19b97c0f1675fb339b
-EBUILD blazeblogger-1.2.0.ebuild 718 BLAKE2B 1bfd9d91abd509e412a4cec49ee512f755491f74bde0e1be86664558963c85c917721f0614d9224a5459d651dc2b90d8b07b6ce98a2cc16e60a2703480147764 SHA512 cd4bfbd80b256dcbe69e9d0c704ecb5bf15a603f4416c34efdca8d2fe661230d9b65967bb9a0cadcf32047ac69e9be528e2ec7a7b853aea1eee10e0d28764a1e
+EBUILD blazeblogger-1.2.0-r1.ebuild 822 BLAKE2B 02d0fa7f918d0d1e534d629bfc4c2d67eee2bd23c2b953a00c9c8b53e82a1dad5960813b486ac0d37cc7fba34c2d171081d57a296229edff3fd136b9c4177f87 SHA512 21c6bd49895658dc2bb1e7c2c6d05c744ba01a955c0e3dd61a4a5f2ec723d33b66c06f856a754b541aea78a5d8de9f907ee45105a1cb62530bf36e9e175ad809
+EBUILD blazeblogger-1.2.0.ebuild 699 BLAKE2B 642fab200ebb1a56542c0669979a284feed911ea97a78cc70987065390dfccf75256f3c2061ceff399f6873925f8be5ed4da76df3dc6d1ab3929c5782d2e509a SHA512 03a9d25fb8594613b44857a2a0d0d66f715e974476f60dd56c512ddfe66b577553d5508da994eec8792e6a21dba9e6c75662275e2aea690e3807442756698b7b
 MISC metadata.xml 325 BLAKE2B 7c6ad84d21680eb68d21ae2a9e9c929f6d5b482bef2f7c2059fec558c76871d4e614800059cc144bc3239c72b0da39172214c1fc7feb05665842359aa1e5265d SHA512 d30a3e0a39a7fb4f542acfd36a545934962449c33dfb659360212a68df41f0e148cf835b3da19123f93ae66f47a11422ede84bb25b2421b2edf57cf0464f1a03
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
index 367dbb4061cf..798b095bb8bc 100644
--- a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 
 inherit eutils
 
-DESCRIPTION="simple-to-use, capable content management system for the cmdline producing static content"
+DESCRIPTION="Simple, capable content management system for producing static content"
 HOMEPAGE="http://blaze.blackened.cz/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
 	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
index 754b71c2148a..2b210aa8daba 100644
--- a/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-DESCRIPTION="simple-to-use, capable content management system for the cmdline producing static content"
+DESCRIPTION="Simple, capable content management system for producing static content"
 HOMEPAGE="http://blaze.blackened.cz/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
 	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 9e8b4e8a6383..608519bd1be8 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,10 +1,8 @@
 AUX gitea.confd 74 BLAKE2B 656800d35c8f0075005e7e9e5c804292f9884663f89f653426064a20cfbcb518f736bd94947a03bce5adad670fb6150d93026999d6d5395f37a85666b6663a2f SHA512 3e05bad19cd924c4375d9ca6fc57142ba4b5ec897a1c789c3fc9710dfcfee209a199c95040eece089ad93e0357486ab98fad0c448a61e318646b7a71845e9a25
 AUX gitea.initd 681 BLAKE2B 779865d105fa7f9dc84ddfd35c9b068190617d436ae109b13997ad01c9b83a038ae1f9467fcd9e1781386d61a9aaa90c9415a756bcdb5fef9e2dd29b2c0a2c86 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986
 AUX gitea.logrotated 87 BLAKE2B 373830ddd6eed0ce2f0f7b1dab14e4a253e5a56a73f477cfadbc6deec373846d4df2d697735391581771699d5a6513acb0e14a446873de01eba10d19e3a6bd88 SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4
-DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
-DIST gitea-1.2.2.tar.gz 14326451 SHA256 865f4c7c785de15cf496d58088b10aa84c4d260ebc9ae8b0cfb8cfa2001a96d8 SHA512 a0efca25a13d157c5d56308f6febdc7b70e5438a74f68de76a44444dac1f38cec3e3c4484c7f69c3773ffff0d6790ab2da29e1d9198d65a84c1802c9848fb2a5 WHIRLPOOL 35eedc2556b80f8468086d5cfffe38b2959baa316a95e14daa27fad7b564510f249a56b0df651a71ab92feb0aa8a759164af00833de5a3e5d937a425a6551056
 DIST gitea-1.2.3.tar.gz 14336812 SHA256 cea707156393a52bc77cb493467b7f04c8b6e7d1fd92cd775a8b587f9c35340e SHA512 b519bb2fae20da75444a9cb971ab1db0aed04261c6522464feb2e0bad28bc5b8fff3ce8a85f8d26e9cfe79b41c29e540b3ff0aa0c3e99ce90e9e9a1ec26a165e WHIRLPOOL 512cc1b05792ec070f7a8d3427e53121eae535dbd7ddc1795908b85a20f11ebc19ec0e3f21ec73d50b233fd466dc0fdb7fcc67a5df913cf88c34b66fc314b7fd
-EBUILD gitea-1.1.4.ebuild 2450 BLAKE2B 430a76b5784ce33501a328913c221c7080e1f881526623fb7855a716ee2986b0d05bf627445c243cc6bd57321f0157accd307e277119e149f0b30d2d587ef6bc SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354
-EBUILD gitea-1.2.2.ebuild 2450 BLAKE2B 6e3b9e7b1639e989719aaf988fae04a8f6b6b43c12436a61ad9fabcdd4112c4826387505839d43cb428a4f82940ac0e1c0f1888651bccd02e4d82c42e701cea0 SHA512 6c2af2db4b1067b548f6affe27e11b266a8287db84920b95c2165b97ed263cc2af19311fc8105d28130494f828865237482d686ec42f5935d5859ed9b317b22e
+DIST gitea-1.3.0.tar.gz 14780025 BLAKE2B a290bf1583a741cfee5ff69c7997114d802643dc0b213a41bbac08713201ce05192d9ad4d7b33639ae173b79d3c5dbd154b7fd753a744ec64550df4786fdc5a2 SHA512 51cfcb53a039ce8c7995748bd54ea34b88b404de35ef6c9c5742b220fee814fe81670634aa272bbd0002431e70e757b0e460d159e41b7378c93cd5aa820d45f4
 EBUILD gitea-1.2.3.ebuild 2450 BLAKE2B 4fde7a51dca944783b98971a453b3cb664ff34038330ecc7fee1768ad93f1fde6979e75b7f148b01aaacd1d6ebb75b124ac51cf8e0c445e532a8b15280f36f75 SHA512 f873a3a5f85ff38331e21eb14efe3e2db57bc68ef4d831d214a8aecfe48b101629909408db916614d80d72ea54afe4e93774db7d83b3d2d8baeaef485656cb7f
+EBUILD gitea-1.3.0.ebuild 2450 BLAKE2B 65d8e7866da5a03dd4e7c019817eb9409fa1d7b208aa0a4b1b592542e7520c73e690a3677d00e7a2033201fe1bbdf04b8a662d0263c0aa69eaef479ac298d98c SHA512 1641fa072b20af22bfe215baa7fc4b2dcad0c4bcb29f18a5a9e09396ab6c0a28323aed6a1f39658f045f32a3ae4d0b0da0ab54a4c39a4a463d26d297374eb0c2
 MISC metadata.xml 324 BLAKE2B 66e4bf11fea6a0b4a0ca353849e1a4aaf32c0a1680c36f1e74fe155705806a822c277487f551e82ad0a3740b4faf9f1f8b2b2ce24781774da6c9f21a3f094f57 SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee
diff --git a/www-apps/gitea/gitea-1.2.2.ebuild b/www-apps/gitea/gitea-1.2.2.ebuild
deleted file mode 100644
index eb6445ca3d84..000000000000
--- a/www-apps/gitea/gitea-1.2.2.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="d81cf34"
-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.1.4.ebuild b/www-apps/gitea/gitea-1.3.0.ebuild
index 56e96b9e348b..e58ca758c83f 100644
--- a/www-apps/gitea/gitea-1.1.4.ebuild
+++ b/www-apps/gitea/gitea-1.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="34182c8"
+GIT_COMMIT="974cffe"
 ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/www-apps/lxr/Manifest b/www-apps/lxr/Manifest
index 7a47d4bdf9b9..f1ff750a40f2 100644
--- a/www-apps/lxr/Manifest
+++ b/www-apps/lxr/Manifest
@@ -2,5 +2,5 @@ AUX lxr-0.9.8-initdb-mysql.patch 484 BLAKE2B 4f503eec1951f8a0010ab1b62cfe577d267
 AUX postinstall-en.txt 1351 BLAKE2B 781df94841c533848e74a6f4b2b317bcbfd68f428206be10c527a4d03c1c4c6ea69bae2642a87e0a94051c0f1ba033a19dd5d28a605138604067fb06bd9db5dd SHA512 4730fcc56b8a775d5922883906f9db8ead7a0f3beb8a46ceeb451f8ba273e823fbe328b227da72f39a9dfa926cd93b77c5d27c0d1ba2730afec0c570b1da0006
 AUX reconfig 357 BLAKE2B 4ebe2e2539021b7411fa814bef122b69d9540848a90290cf89182a3557a26db83332b5036e1be74c6e018604b44b027897b22bf08c18f95400fe6c76e82c9d97 SHA512 b218ddf830fc1412ab95bd53377f07b76209b2dd7640654618e937355efd716f2374a0a18f97e8f92c06619f8aed6bbc311eb93541ebf088437e40250288f8cd
 DIST lxr-0.9.8.tgz 104246 SHA256 2caff9447cc2ef1f82d96ce5a2fc4a0358f2d12de52d73a91f29ae5119db4bf5 SHA512 2ee9965448edc63a35a3c9d51b2e22c142e5e0aed8e487a590ad3e8a9f840f94fbe38736fe139fb02941ab4e5c891821460b0f32b56a52bf295988c6ef432318 WHIRLPOOL e25bc692b08666402e8ef09b9f464811b7d49bbe7ca2597d35e3d9f3dbe2b4bb285ae52e748b86b11327f92a491863ede9030ba914f6f8e3a2251ea3f1b8859c
-EBUILD lxr-0.9.8-r1.ebuild 2076 BLAKE2B 8c8a1a808cdd43a0413effd06fe0da1dd925fe9a36b1f3cc419959884d482999fecda7565ad48c3d6ca197eb94c6fde44467b553aa76062bfde35d17fa950411 SHA512 98affe97bfeddef0ae122190926595098f153bf1e669a42880b884f8c69452dde444143fc22996d42ef99ebc7ad7e32a859ee9071e6060274a38308acbd5e54c
+EBUILD lxr-0.9.8-r1.ebuild 2074 BLAKE2B 6b612ac4817923e6aa22d43447c2fe4667157daa5422a2cfa36d79077e4b338186d470b06ecff502623fac0ad5019066ae2b02787155282984074aaea02d58f0 SHA512 3046e42362be0bf8912f403f3c8b305ad81bb533bdab8f814f748237c350424f1b8022d493dd81ee6340f838f6b5d3a0bbb180fa7250b1cd2c9a03abc030d433
 MISC metadata.xml 323 BLAKE2B 9df52ba795520f0636d98fd35cf63b4f532c7488d0c9737c09c93a88ce29db06f34ceaf0aa0470d3c34be5a56f99228580d9538a35e7696dfe5d3a52810f7e02 SHA512 2010845b78056b6e51326ad0a3c8bd88152f20a2799ba14c4cbffb52374e5d81135a6972b6a16446f3c8ee456169dea9dc717d5aee452636d7012152991666c0
diff --git a/www-apps/lxr/lxr-0.9.8-r1.ebuild b/www-apps/lxr/lxr-0.9.8-r1.ebuild
index 69967becba38..b7ffd3e3f5a5 100644
--- a/www-apps/lxr/lxr-0.9.8-r1.ebuild
+++ b/www-apps/lxr/lxr-0.9.8-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit perl-module webapp multilib eutils depend.apache
 
-DESCRIPTION="general purpose source code indexer and cross-referener with a web-based frontend"
+DESCRIPTION="general purpose source code indexer and cross-referener with web-based frontend"
 HOMEPAGE="https://sourceforge.net/projects/lxr"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
diff --git a/www-apps/openwebstats/Manifest b/www-apps/openwebstats/Manifest
index df609185b81d..ad5a2c9ebfcc 100644
--- a/www-apps/openwebstats/Manifest
+++ b/www-apps/openwebstats/Manifest
@@ -1,5 +1,5 @@
 AUX config.php 2106 BLAKE2B 727e4dca51bcf691399041e260d3318382a6e97e2a23d15f1b93473fc744ab853c3c2a97782b3cfa2c2062aca7fce1563757925bee9dc46712a344cc12d8657f SHA512 c4db28cffb2dd83bf54f483d57468cd0602680d8b40f471fb063a37a4a4ca3968157ef9aa0209c26d97a86855a1863c0908779bab0e54f6fe3b747cc38a887b2
 AUX postinstall-en.txt 1245 BLAKE2B 50f54e2cd971c13d120a2664beb3a569c74b9350fbf13988021911efb24063dd894837e951b1250f45fa828b314a0c10cc00dc1afb137b96982dcd7ee720c884 SHA512 b814a821aa70c1dbaa736976a7dc19c9589efa3f50cbb2686ce9059c339304bd224d7849265a64725805ee86463e948a15c24e2c807cef05a6f625bb463bc78a
 DIST openwebstats-1.1.tar.gz 163477 SHA256 6378591300c68921fc2d5cd38ec9aaf4b00a4d34f97d3eafad2d22097030d926 SHA512 882a8aa672703e978282550437ea9944bc44c424c3a157acd10f35a42681721de4bd5dde60aa9e57e15d3b986b1b4d1c9f0e4adf0360a0d569aa46720b4e2eec WHIRLPOOL cced50e545688b80fd7a94bb7ce1c71fe9818a6a52d1fb32f789c2dac0a8bbe484809848e53baaa272f6da13af3900dae43d4f52d5650337cbea17f6e3ab8c23
-EBUILD openwebstats-1.1.ebuild 882 BLAKE2B 6d744e7b3bf423916407fb8c53fb9bed578d6bab97261bb47a286b3cdeef24bcb4959c28ce7dc52dd9ef342613aec4496cba8be3d6d91ec867f17be988ff65ff SHA512 691df3b04ecb9f0748ddf2912fa500664ad9e5116c64e536292b1b71f03f8bf18e72f52b9aad4c41a2e07b57058278691f32eb0cb66b64eebb71b84c860e0a45
+EBUILD openwebstats-1.1.ebuild 871 BLAKE2B 3ef9c32a6be5b3e9413b6eab98fd5725f5eb0a2b69a5604d44b308918c9d1ecda0c578338f22ca8b87bfbb41c247a1a6d2e8df6a9f1a7634a17eb9cdf3119e99 SHA512 8a9072836d7f951d25274b864ba885c977fa4d3d7964eab2452f04802f5a4e62d438af0e0998d4ff7762df4f04d25adf85c253173e935704dcc12632404720fb
 MISC metadata.xml 332 BLAKE2B bfdbd52b41802fcbf1f331c475605684db0925455ca692c2ce8755c95a753709016906d29878bd86d60d6cbdbc3f5e520db46bbd8953efad86103c34645d308c SHA512 b3a5cd09143fa07cc7f0ebaed3382a34bd6ddfa0e28f4540a01356be6d4d4b4367dcf2b6ec901179526f1deb5f66ced1503dbe8fcf9e41b7addd400dde6dadaa
diff --git a/www-apps/openwebstats/openwebstats-1.1.ebuild b/www-apps/openwebstats/openwebstats-1.1.ebuild
index 4aff79996bfd..5171e9031e40 100644
--- a/www-apps/openwebstats/openwebstats-1.1.ebuild
+++ b/www-apps/openwebstats/openwebstats-1.1.ebuild
@@ -3,7 +3,7 @@
 
 inherit webapp
 
-DESCRIPTION="PHP stats application that reads Apache log files and imports the data to a MySQL database"
+DESCRIPTION="PHP stats app that reads Apache logs and imports the data into a MySQL database"
 HOMEPAGE="http://openwebstats.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index a2a57c8a1ba6..ed494aa4651d 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -7,7 +7,7 @@ DIST Trac-1.0.9.tar.gz 3642845 SHA256 9ed3f0a2039c46132d10f35c211f9f6ee953339cc0
 DIST Trac-1.2.1.tar.gz 6212917 SHA256 0af71c555f4617849432bba1fc59c1654cd13d030ebbcdbef814d82d7a8bb0c3 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f WHIRLPOOL e2b17393dea34f39a030099b3fd02c68bfacfb7a7247008cc84cda5bc5807752dcef52ae345b39ab2aee02eef4aab04477d5b76d30bcf649991c2a53f5a7dd6c
 DIST Trac-1.2.tar.gz 3821867 SHA256 fd3cf3a9d2113d94f4f153995e737bc747e8d48cc40ac5171a114266ba4d2b0b SHA512 0655723a6727df389d66bb9c752436a81c820750659e5bf7a64485c4362fa1b1c1cb6dcdaa9936003838ce5874b20bbc5a8d8fc1034b96ff31b3bbc6f7fca105 WHIRLPOOL d347dac1eeb426d25b15a7c0f34da4363fb9f5d424d3be311750dfae9dbd515d54ab8c72b408ae6f7fe2182da10b9c4f0057b28bc3b52c7fd2ca7bfaa00f14a6
 EBUILD trac-1.0.13.ebuild 2949 BLAKE2B 8b2a3e07fde928935c936997da3df5bd3ae3636bfbad0c6a8ea0277855535a4e2ca83c21c1922ad2830de4bf067d8818b2c4c13b70597bd38872d16c70beb93c SHA512 6fd1b0d2cb2df809849934db5b925c151d28b62963a7223d2c4bae24304f1c856a98679eb008841aaefbb849a7ed66ef4d7743fb653c6dc559c28d54b47c4372
-EBUILD trac-1.0.9.ebuild 2960 BLAKE2B 59070ae5f2b8685de36d2f3349f4d257811b69c55880d8f3d1dc25530ab77384ce55df1e1d3e955a7e67889b7f548e9dab96b81429245cc0a351a0e7b70a5ed3 SHA512 9c6a0c4d20adc5cf4164894883088580fd5eac246def41535bda9b19f7661c5559150cbd28fec1ce0ad592061a7ef1b9ce247e89ba68929c5162995e1f033602
+EBUILD trac-1.0.9.ebuild 2946 BLAKE2B a5ee7eb97e265d90e03c92e2d502e3131e4b0246e29f704fac19b2ae06979bab468f2a8146fa9672dabe14283dc48eb7f2a0fe791e6f455c4bd98e9af9c05954 SHA512 7d594474dca0052e867a6f9dcd4dfd918316071bd3a00969ccbdab3685388923f34f8cf530d0a63c1e639ecf38b6c87946a37301614cb0979becfca30bbccba1
 EBUILD trac-1.2-r1.ebuild 2623 BLAKE2B ff66adc162b87210921df67692adb95a377744adca97571cba486c38fec8fd9a9c90992530eaf8263c14e7d5ac4ed759ecbc481baf9cb57ddfb0af8d9b820a82 SHA512 65260592ffb0460e74324f9f588de53185896c154dac5cefed88b9bb304e03af76496352d7d5bc5f3b5144680274ad877328d30d8cd7bcca57730e0070c2e9a3
 EBUILD trac-1.2.1.ebuild 2623 BLAKE2B 0534660b39d40050690f7a8407a98f93e6352c5d39893a7168749b82c16bc722dda1b97a2641497a0630fd38cdc1cf6e22f3899c9eb4000911b5a755aa54e70d SHA512 c7f70dcc0b23d169b087e6aee3d65e1fbb14f9c5038f1aca60d5c9480364c98aa5ac4dc2f3ed8352539d2c4a4cd7b742743f2113670d94581526b81b16b09967
 EBUILD trac-1.2.ebuild 2949 BLAKE2B 8b2a3e07fde928935c936997da3df5bd3ae3636bfbad0c6a8ea0277855535a4e2ca83c21c1922ad2830de4bf067d8818b2c4c13b70597bd38872d16c70beb93c SHA512 6fd1b0d2cb2df809849934db5b925c151d28b62963a7223d2c4bae24304f1c856a98679eb008841aaefbb849a7ed66ef4d7743fb653c6dc559c28d54b47c4372
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
index 3e262e03464f..05b93fd82c2a 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -13,7 +13,7 @@ inherit distutils-r1 eutils user webapp
 MY_PV=${PV/_p/.post}
 MY_P=Trac-${MY_PV}
 
-DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
 HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
 SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
 
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 5f36e03bbd8f..027788127a8e 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index e3e67e702558..35c7acbac0d0 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,5 +1,5 @@
-DIST opera-developer_51.0.2776.0_amd64.deb 55610282 SHA256 33fd02e8dceeec924925b9adabe51d111b32aaddc2926d3569163b8efc8b325b SHA512 6f771526d4e04b6bb801bb67f8058cb22ca62aa2543ca67c318edc13eed11d058cb5fc998a95cea655e0957626f3d022c1151a9da627b18494c1715b3be0f57a WHIRLPOOL 692fb7d74031f93f515a7db69b749e6b4a3c3bda098c34a46439d5d378863ff924fa545bd4ec80ac1a1115d5d53468e68340b0cd9787f7cbd3778c9ab2427ecf
-DIST opera-developer_51.0.2781.0_amd64.deb 51638314 SHA256 c59d7a2fff353a22c742b2c788d1cace3a28abaebb7f527951d8b006f8ad1f2a SHA512 05925468bacac6d20ddf4113b8e99292c108749e10a504a82d010a6ff0c65b7cae08588a5fb8c06bd510e3be6ba18fa742ed34ea043c49c4d049ad09bca8a699 WHIRLPOOL 7d18e24e11834434efef57f25292cd4adf0d2420375cad46febc2c492cd6a325904b04693e1a8f3ba74157f60774eb266cb9a65392ed89be731862b882e2c1c8
-EBUILD opera-developer-51.0.2776.0.ebuild 2316 BLAKE2B b9f49efbb0a6c5d92ef790cd1a4eac1686c9e826fd2a24a7e67d1cc415545f5c927861690da4ef43188e1f49a9fb50f9afa6880daaf01f759d094af32d06851e SHA512 5df232e6a39fc6b70a1bca945a84042fa85e606f79832d650899ba0c32301cbad46c5b70bc7c2d5b4b4814991aa2263d012b3808680ef0c8c43f27655e481dac
+DIST opera-developer_51.0.2781.0_amd64.deb 51638314 BLAKE2B 45e6b79325b2e6764b430eed1eb767d514fcf46649f7fa66031cc7fd2f9a5c180642bae27c7577a180e8e147fb30e64cb61584906f8634dac24baa761dbd5659 SHA512 05925468bacac6d20ddf4113b8e99292c108749e10a504a82d010a6ff0c65b7cae08588a5fb8c06bd510e3be6ba18fa742ed34ea043c49c4d049ad09bca8a699
+DIST opera-developer_51.0.2791.0_amd64.deb 51876582 BLAKE2B 2c18830ff2e8bf4b5d00b4c4a860fd580aec30edfa04a0c8bf811af96d4390e3bf5bd7a4d8893241999460030f2b87c4a6fe3049b9350e0180ff44baa119f108 SHA512 6659496d25c6cd5d91df17324843ce048151618a589bb0eae79290ba534330862ba4d289a47278ad12416133348ff2487ac5643fd8a4083600db59e4b27f8989
 EBUILD opera-developer-51.0.2781.0.ebuild 2316 BLAKE2B b9f49efbb0a6c5d92ef790cd1a4eac1686c9e826fd2a24a7e67d1cc415545f5c927861690da4ef43188e1f49a9fb50f9afa6880daaf01f759d094af32d06851e SHA512 5df232e6a39fc6b70a1bca945a84042fa85e606f79832d650899ba0c32301cbad46c5b70bc7c2d5b4b4814991aa2263d012b3808680ef0c8c43f27655e481dac
+EBUILD opera-developer-51.0.2791.0.ebuild 2316 BLAKE2B b9f49efbb0a6c5d92ef790cd1a4eac1686c9e826fd2a24a7e67d1cc415545f5c927861690da4ef43188e1f49a9fb50f9afa6880daaf01f759d094af32d06851e SHA512 5df232e6a39fc6b70a1bca945a84042fa85e606f79832d650899ba0c32301cbad46c5b70bc7c2d5b4b4814991aa2263d012b3808680ef0c8c43f27655e481dac
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-developer/opera-developer-51.0.2776.0.ebuild b/www-client/opera-developer/opera-developer-51.0.2791.0.ebuild
index 79b9f057efbf..79b9f057efbf 100644
--- a/www-client/opera-developer/opera-developer-51.0.2776.0.ebuild
+++ b/www-client/opera-developer/opera-developer-51.0.2791.0.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 176c35391be2..a6056e37a9d4 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,5 +1,8 @@
 AUX vivaldi-1.13.1008.32_p1-libffmpeg.patch 1128 BLAKE2B c6e8dccf5625128ddc6d671835b6b4288a5b67a501a83f8794f98d42f92e1d681a76534c7d175e4b3fa3e70a732decbbd7656e0045754a0c4d8f017c5e6ad92e SHA512 8af68ec79839922ceedd3bcc32dc2e600337cfbede48bc1a254841fd2cf3f0eaaf0d84bc59f292c3b383af72cfbd24aa0b525b34f35d142938e29bddf2ec190b
 DIST vivaldi-1.13.1008.32_p1-amd64.deb 49248234 BLAKE2B 8c9051fd749e37b85f601fe9ba4fd1ac7a5251ef4acd0584fd929ff29d8cd9f70a7e121b56325ffe857774a972cf378541bd81a56f1311b77f0cbb4414c7cbae SHA512 a8f003c2391b80cdaf64feaeef09fed318f03806276bfc2a40369ad6aea0acd70cdb18e674d3407a9ebd6bf1920998461531795d6eac676fae5a94118e4913b5
 DIST vivaldi-1.13.1008.32_p1-i386.deb 50138250 BLAKE2B 4e76e4d78fc2ac0093d25750fc38b0594784d85673d8520f520bca8788d6515bf7bb83148e994f52a61a31c72f79ce6b5152c38e06fed58aabe6453c3d05106b SHA512 ef0024038a35cc35e083f0652c5025e327ab39c653d3e44cb188949b8c75704b6cb7e325a87cf17999e8045f6f398841d523fc6bce215dc2caebaf9d63f56653
+DIST vivaldi-1.13.1008.34_p1-amd64.deb 49259224 BLAKE2B 32756c71b42942c087dc563688225ed9013d8de3da3e788b5aba62ad25d08237e2a6583d50379f0a9a3d2ab1258250adca4d302fec563a2d63f04c92a51a6349 SHA512 4d26ee227a11eecbb32062dd66de2ac64d94f7d523c83dc815ed5125b0f0ea86cc52a7877777d5df4135eb5755693b1772cc56b18d799d70dc46558826278b68
+DIST vivaldi-1.13.1008.34_p1-i386.deb 50147426 BLAKE2B b595c78e85a8a1bfe08554a7e85db7969ffa798488b053a5254bf819f82f015033a98793696a293e2080a8d1dafb30cdcd9ad30a6ae7717b95ee7bc4e5613643 SHA512 450f0983ff753fb64fe9c588f151e9a6b5cd04f4c2fd03a41e8a1af28ac3db0088a3a408eacc9394f2dee589381d03037d06601d8d5a50274b867a3b708206ef
 EBUILD vivaldi-1.13.1008.32_p1.ebuild 2917 BLAKE2B 30630b87430a448a41b9fa2d8f3c99c37e85e4752342b18200b2f18b45d36818da6c039ed6a1f1af6fc3b6d582b66ebe31a29cf46ccfa0a0dd9b4adf28871784 SHA512 10031a6d17ce7293109ffbb8d6e040fe3c58bc0f420084e081dc67be4917cfae3b2bd2386a0202518f9a66455f07ea4e6d9c2bfe86250be8a3590f02d5e7013f
+EBUILD vivaldi-1.13.1008.34_p1.ebuild 2919 BLAKE2B c423155ba080115e243c5f366c9aa046fe4a11e0aec687d11cbc792fe8d40d74d41c51b9cebe91e91b3cacee54006aba4273cd4f1a17ed510b8b0fd908ef631b SHA512 27b3373067d21e6570993c29c42874017151a93892222131db2146a5d3f9256a970b9cc5c08d4d7704b5e779e2061169d579b12f44893a8dc62ea4a765774f79
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.34_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.34_p1.ebuild
new file mode 100644
index 000000000000..83d658c050df
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-1.13.1008.34_p1.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.13.1008.32_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-client/weboob/Manifest b/www-client/weboob/Manifest
index 9cf405ff64b5..41b5bd6b09c5 100644
--- a/www-client/weboob/Manifest
+++ b/www-client/weboob/Manifest
@@ -1,7 +1,7 @@
 DIST weboob-0.g.tar.gz 1465176 SHA256 ccf4643fa0573a905061b29603fc89ef9e953fa7d88c0d239807689c2eab5b2d SHA512 802b0f4cb10d1c2a13dc183d59aa642a9642b3b8f9417ce7bf66835a5f7028bc3fde9a8f3048b01cd5601585d37e6c95fa277b768723d05ab1b8eb4cb74a40bc WHIRLPOOL 4a42b4b48808f9590be1a4b0ab63cf79779905b9c4d789b24919241e85185bc07ace4a2cb8d6c34057ec86936828eeefc99e130ec4d9f7e507551340d3c86738
 DIST weboob-0.h.tar.gz 1700259 SHA256 070fe65d50ebac3901ec77b2062857be6a7174184d40634e50caefd1e5cb7ec2 SHA512 9ec34d184f965ec9124e7cb7e40e9337f781e2d79171fdc2f48b20d68bc21b8cabb349b56229b97f86257edb1d9f24886cbe3576a0fc80ed4440168119ea7e2b WHIRLPOOL 36e370ed0dd08a889dab58ea59903ed76168b689899811451a6add344b8fddbc433b7fa0b977db3b5f0c92dc5e6c7a26c8c664096e87b1f5c44cf8e40a0142ce
-EBUILD weboob-0g.ebuild 2037 BLAKE2B ebf74040a13dcc4b37545c8512c16a5f78b63c1b24317b5a4e0795d89ac02a5369c3a39d9223795507057522366e8abbe2ddf8f3b3c6803cc22b5bc19a18faad SHA512 efdecaff884050a9f56753772af1bbeb5113969721f64bbe895d230298f7388def79bcab2e02fec172656adc039d575f083361bc6ae779491e18ae0f3e879dde
-EBUILD weboob-0h.ebuild 2037 BLAKE2B 048851fe565e93bf45ff3bcc8a96bd32b2faa9b78c54ebac4cd880451eae6426f6a28fce6055bb198b2f4d4dda9d15d2ed97b2e0c32110b3e9824b8df653c3cf SHA512 f9710179b3e9392aab56867e11b4f1e039b75e2821344e3d77992832e7d1dcd5d62bb2245d6feafe02e22d1f15afd99837a5bbde7c8c0bde9d0a9ce99207fe65
-EBUILD weboob-9998.ebuild 2037 BLAKE2B ebf74040a13dcc4b37545c8512c16a5f78b63c1b24317b5a4e0795d89ac02a5369c3a39d9223795507057522366e8abbe2ddf8f3b3c6803cc22b5bc19a18faad SHA512 efdecaff884050a9f56753772af1bbeb5113969721f64bbe895d230298f7388def79bcab2e02fec172656adc039d575f083361bc6ae779491e18ae0f3e879dde
-EBUILD weboob-9999.ebuild 2037 BLAKE2B ebf74040a13dcc4b37545c8512c16a5f78b63c1b24317b5a4e0795d89ac02a5369c3a39d9223795507057522366e8abbe2ddf8f3b3c6803cc22b5bc19a18faad SHA512 efdecaff884050a9f56753772af1bbeb5113969721f64bbe895d230298f7388def79bcab2e02fec172656adc039d575f083361bc6ae779491e18ae0f3e879dde
+EBUILD weboob-0g.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
+EBUILD weboob-0h.ebuild 2008 BLAKE2B 46989e6bba0a571a6af057e2cf2fc1763003861351971bd7978c84f104a0a4fa274a685ed91182c7d1f4de4613928e43130aa430d06c798d4098711be6587b48 SHA512 957e543dbe2e32c9a5cc91428c07b1fc7f349bc898f9cdbd07d822b8d4440a6b21f5ee4d8768af1b60347f46d675a5217166ff440e1f431d242d16922f4e4b3d
+EBUILD weboob-9998.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
+EBUILD weboob-9999.ebuild 2008 BLAKE2B 98bde76eee9a1c7a0714b8347d7e4f0dbe67de7c9aed854810d4056934e1e4c86f34e5aadf008ab131ba98244c62b5f449a19ae945294cec3b5217c42842f6b3 SHA512 d4e0a1cac2c2e5f8d0b2177543a03f3fa167dc5792d1fecdbd790a14a6629edb3388d26b877e281f17c69cc0642c465f9f694f96da9847428e903e18906137de
 MISC metadata.xml 370 BLAKE2B 78add6f45e7d9326a94833c4c34e55c09ed2d5a5afe6be2ccfb6b1e5cd705066fd115f38c5bd22a4729582e7217ccd17884fe639960384e1c6bc4c14c6d5de07 SHA512 a5e4d8c198fdc5d5267f57d2c5817f499d7e27ed724057e4c6af8e48da319dcc346e32c56cd79c8729b6deab09ff619608a5b6620967c9c68f843fd189800a3a
diff --git a/www-client/weboob/weboob-0g.ebuild b/www-client/weboob/weboob-0g.ebuild
index c16639ee1d11..8cc40ca6189f 100644
--- a/www-client/weboob/weboob-0g.ebuild
+++ b/www-client/weboob/weboob-0g.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
diff --git a/www-client/weboob/weboob-0h.ebuild b/www-client/weboob/weboob-0h.ebuild
index db159fe5029e..d3f6230fa0ec 100644
--- a/www-client/weboob/weboob-0h.ebuild
+++ b/www-client/weboob/weboob-0h.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
diff --git a/www-client/weboob/weboob-9998.ebuild b/www-client/weboob/weboob-9998.ebuild
index c16639ee1d11..8cc40ca6189f 100644
--- a/www-client/weboob/weboob-9998.ebuild
+++ b/www-client/weboob/weboob-9998.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
diff --git a/www-client/weboob/weboob-9999.ebuild b/www-client/weboob/weboob-9999.ebuild
index c16639ee1d11..8cc40ca6189f 100644
--- a/www-client/weboob/weboob-9999.ebuild
+++ b/www-client/weboob/weboob-9999.ebuild
@@ -23,7 +23,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-DESCRIPTION="Weboob (Web Outside of Browsers) provides several applications to interact with a lot of websites"
+DESCRIPTION="Consume lots of websites without a browser (Web Outside Of Browsers)"
 HOMEPAGE="http://weboob.org/"
 
 LICENSE="AGPL-3"
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 3b8e32342a02..49eeeca4b919 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/nx_util/Manifest b/www-misc/nx_util/Manifest
index d094a1876496..9adc2c75d704 100644
--- a/www-misc/nx_util/Manifest
+++ b/www-misc/nx_util/Manifest
@@ -1,6 +1,6 @@
 AUX 0.52.1-fix-install-paths.patch 1931 BLAKE2B 05fd20433f9ec335928c70bc76f098a67e839f0fa35dbbf42cbfbac22943f0592bba36653b9a4d8ef4d33c83e400748d389b681ea29fc271621673e83dfc8ab8 SHA512 151c71732de120f3ff982097de084f2096e1592f8317a87c95b8cc4af66b7705f25f120b6ba972f0e296c9fa5528b5450bcb7f6b6fa67a33e149be3223964dca
 DIST ngx_http_naxsi-0.52-1.tar.gz 162044 SHA256 0f23b0f17f03591775e95294a115d609ad47e2874e5f01c4fed1ebb680ea07bc SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 WHIRLPOOL b42c4dc99c2a0b670b4e06ee9b5a0eb1b38b96f670c04c56fa30f13b8d3263836b54ff641dc1effd0e461f0fb3e0b935f945c2467b27c83f80b8407a3b42f739
 DIST ngx_http_naxsi-0.53-1.tar.gz 165627 SHA256 cde175f940cd2e8c595b95512642cd3f8ae6f3c4a2ee10c2fda214ffeb808274 SHA512 33e3a92242304f4e5900cb66915651f1c5ba78f40b27f41c1d81353390ef6baef5a6a03042441c200d4e489e70f251d782efe0644b916a2ff34833be8a8fd385 WHIRLPOOL 67c5cb73cc04381bf874222f9aa20d8ec063f074d139b8fa882bc9a84526f5d192f066b621a429086f93b1a55ea235e98623dfcb69952451dd870bcf316bd928
-EBUILD nx_util-0.52.1.ebuild 937 BLAKE2B f033a7e33329c5b89e1fa52edf2e451a5cd9af5d24cdad4ab15dde2cd94c1028b0d045513af32f3d65cabf5741449d77b0dc0e8e807aad71ffbde2e1b5e588b7 SHA512 c1813fb0456476a16d77e51a63d7e41554f365d8059dd3b8a0d15ed30e7fa09294389f1d972de3b6fb5544d161f97b161e0cdcd2ee8926c5858fa88dd0d8f718
-EBUILD nx_util-0.53.1.ebuild 938 BLAKE2B 6fe0c3accc2388909c78783bdd4644e59d45021ae320a1b7c200793e1c0cb44a9e3d79ca12c522c9e64ed23a75dfef8f9ad2b50fea5e21d83c2c2b6d8b598c1f SHA512 aab6d59065cf4b914ac60c5b7740b083b56e45cd9061e080b3372e20c2f2762808c34f7d9788c0331557e21934d8b528d0e595d1f303e86541ee4e0780498651
+EBUILD nx_util-0.52.1.ebuild 929 BLAKE2B 2fe9540db4037a9e4b89bd32a5ed7e55ed1940240eb233f714fd1f7081046f857c086586ef7254a5eccf506547834b28ef0101d329176f259a41da9a298098a4 SHA512 fe52b5b0989304dce76cf3b617fa2107d104adad72f12cd1b724447e2ab8edd7244a709f63218ce7d86ad65d00a1e54759b85af7b04850766a3a529dbeb399b0
+EBUILD nx_util-0.53.1.ebuild 930 BLAKE2B c18a1b6ee2dcbfe7f62c9cc295d64255cc96b5b94702ef1fd2252419d58a9b9854b517b9e89c6f407cefabe5ec48ad677ce7aa9d60c284b283564dfb89bfb5f4 SHA512 b788feea8d7f795c96fcac71198421017e6a3f4a81b19e08de80385bea9bff66659a69371ca59a40a0918c817c92bf0ec6e1bc78b0d4a2cc83155cc77c20d7a0
 MISC metadata.xml 381 BLAKE2B b49ff81972fb6b059efdceca3e4721e0420fcfc6c611576645248d280e38cbd25f14a1b7a7ebecd97060266288e5341d5af89ee4ad048697dad57e728478deda SHA512 9da7d67a3663f7ab3bc28cfa880d60a8ad70706a106dc00d181146b099e550f1c66940113c9c26f52b0639e7013407eafd9ee58d53f41a55f1330eb203d345f5
diff --git a/www-misc/nx_util/nx_util-0.52.1.ebuild b/www-misc/nx_util/nx_util-0.52.1.ebuild
index 0a83e644c16f..f0f2265043c8 100644
--- a/www-misc/nx_util/nx_util-0.52.1.ebuild
+++ b/www-misc/nx_util/nx_util-0.52.1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 versionator
 
 MY_PV="$(replace_version_separator 2 '-')"
 
-DESCRIPTION="Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)"
+DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)"
 HOMEPAGE="https://github.com/nbs-system/naxsi"
 # keep the name in sync with what's in the nginx ebuild to avoid duplication
 SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz"
diff --git a/www-misc/nx_util/nx_util-0.53.1.ebuild b/www-misc/nx_util/nx_util-0.53.1.ebuild
index aba910cabe96..3ea7c4f0c8a4 100644
--- a/www-misc/nx_util/nx_util-0.53.1.ebuild
+++ b/www-misc/nx_util/nx_util-0.53.1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1 versionator
 
 MY_PV="$(replace_version_separator 2 '-')"
 
-DESCRIPTION="Whitelist & Reports generation for Naxsi (Web Application Firewall module for Nginx)"
+DESCRIPTION="Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)"
 HOMEPAGE="https://github.com/nbs-system/naxsi"
 # keep the name in sync with what's in the nginx ebuild to avoid duplication
 SRC_URI="https://github.com/nbs-system/naxsi/archive/${MY_PV}.tar.gz -> ngx_http_naxsi-${MY_PV}.tar.gz"
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 7508c2b67b40..13e16931039e 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/pathod/Manifest b/www-servers/pathod/Manifest
index 4d473092ccbb..9d1b54641458 100644
--- a/www-servers/pathod/Manifest
+++ b/www-servers/pathod/Manifest
@@ -1,7 +1,7 @@
 DIST pathod-0.10.tar.gz 245837 SHA256 54170dcb03b1e5d693be87c0c069c16f6a794b64f86c9abb96996b13f2382ebf SHA512 c096268cdd459ffaf2ced67699be57bdcdc51db271ce141734d4984795d045ef24a7301f18d67af9b48d802b5107d246ec891b5eed5dace52d0835c2c7dbb336 WHIRLPOOL 09aecc68e43f5948aaded63bbcc5c705f2584dbf3aba207ed24a3975586b6fd1ed860d73e364f8f37dd0addabd74b5d4fc65bc78656597d70e617dc27f79c68a
 DIST pathod-0.11.1.tar.gz 271616 SHA256 69d91a494a8ac71e8d1e2c0cc7140fc52be0a04aa37f7fc8560ca3b168479058 SHA512 8fa4957bd7f25492a9db58eec7e83a67cd998bda17f93224435ef3f75ed6723bec96d24e20956069d148af3708d81f04d9089c2302d260d3ba95c1993ee0954e WHIRLPOOL 4120b9fa4471529201de98345be86cbbdd2cded9ca7d6dace51ea2bae47ea48e6e542367bd8594a4213982b2e5635c83cf9df3581e8496467fc56efdc20baff6
 DIST pathod-0.12.0.tar.gz 228515 SHA256 4c43a442f77dc1fae9bad8c22380661a80563c0d367e51772df7f37293bce001 SHA512 5273736b972670e009d24b610ff1e43d1296ae5e5a42e360fdd7ea3aa355016c02ceccd8b6d342e99b754b5fbd9f7beca92852607b9dd3af9d395128453fd0af WHIRLPOOL f32f917df02a11aa0f6fad02e15dcb0b3476aa00889747f1e29f389d6a727d2fb3c4c6a3ebb9eac2b8eba5d14065fd2bec17dbd427a927dd6af38ec1764af3b6
-EBUILD pathod-0.10.ebuild 687 BLAKE2B ab31e561d112f0c7697637821ec34524fb257d60d291a21373d21a5bf2265cfa660199c469299bc390813a048d4509d398512eda425c1ebdacdb0abae394d5d2 SHA512 5c702931a50a9b1b8dc6def8297171eda11e23fbf5ed4e621ee4f21931d0efa943d378772d6fd2b087a0897f9af5930c48fcb76f30fa49d0f8f692f5401ca6b1
-EBUILD pathod-0.11.1.ebuild 866 BLAKE2B 8fe6486915e5f7e731404acb3917a5696a6268f4aea90278436b729696ee1c7dc8a955d9fdfcbe55e1da385fd47ded543e74e71e9de8014565f312f8d61c929c SHA512 abce9113d3843705e5dc1cf372ca78935a685c47c90a51eda08d664a35e2bb9f50d33a3d900263b0b370d42e15f84cf2c004cdfe705d7f3f9f9e83800b5242bb
-EBUILD pathod-0.12.0.ebuild 859 BLAKE2B 45ec1c8f8ea824ee5e5886457935b06243aae4d6e59b8342f665622b0ef49bed8b82ca9368248553e635d93c749dba6c2b0a2c411ec79a0395ab39b34d27aebc SHA512 a9ba21b3c1e7a6ed37b34289785fc821165417dfd751e776124aaaa1e0544b70ea0f2e8b2318b4e8b30fa502f6f297a4cc59a833c7e7dc3dc438f1b6f1672ed3
+EBUILD pathod-0.10.ebuild 674 BLAKE2B 2a8496ef271342799849b3bb3182ba038c897026acf9458a1ed58dcb14cdb8868ce08dca6530ff90ca948884ccfcb2ab2265a742e22dd06a4a253050091841e0 SHA512 e77569bcf9aee8618617611f1c173c7800dbd5be041a1359060cf3e96c2c0ac781a7a35543116cfe2ae41ae48fdde2cd115d25f274cda0bb4047aebafb9a51c8
+EBUILD pathod-0.11.1.ebuild 853 BLAKE2B a4ece5a6b82892301dc2725b672bd8d2035321fa49937765a8b83a7ed7ed8c2ceda629977e4bd0dca19c2beb257c89a4c886afb07555201e689e4dedd856f433 SHA512 aaafe2a3b0e8ff6467dee63243b8297e2e621dfb22a4dbbcf6898ba916d26c2c468bafc72a3fd7e1874984593dfbcdbd36c4de44b40dc4e71a419e7caf80653b
+EBUILD pathod-0.12.0.ebuild 846 BLAKE2B 28001480cd0286a07af7decd6af6153e868e6acae9c52b0a8574845ba2c3c6ca8c7da69cbdff9165bcb29d159f66f0b9841a6db47e78ba352be4264b89ceab61 SHA512 8de5db23e937baf0b53d675ea14ee90d279cdf6acbf8abaf2724a56443728a3dc46bb4c5cfad83e8f22fe495ca6008de9af89e5d5a78d52147942e61b7b5f5bb
 MISC metadata.xml 315 BLAKE2B b4df390e91f4ff27b9c0a7283c3b5230a5a76299dd413c9f668c8afaf85fc8e29eb10fe36b8a48d73ed48b9ad8f59f126f005d391a2c6438687b96489252d7fb SHA512 b02fa957ae01e6f61b4b12d9f4a999963c0614046837f7eed5482424e37b3c6b6d0d4c0cb4cf02ec6b217c5c4b61f584f118d6f2d3d0cad85c8f4829c733696c
diff --git a/www-servers/pathod/pathod-0.10.ebuild b/www-servers/pathod/pathod-0.10.ebuild
index 06b6884e12e1..d87e7bd29861 100644
--- a/www-servers/pathod/pathod-0.10.ebuild
+++ b/www-servers/pathod/pathod-0.10.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="A collection of pathological tools for testing and torturing HTTP clients and servers"
+DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
 HOMEPAGE="http://pathod.net/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/www-servers/pathod/pathod-0.11.1.ebuild b/www-servers/pathod/pathod-0.11.1.ebuild
index c2f72d70b67e..d368b1becdf6 100644
--- a/www-servers/pathod/pathod-0.11.1.ebuild
+++ b/www-servers/pathod/pathod-0.11.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="A collection of pathological tools for testing and torturing HTTP clients and servers"
+DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
 HOMEPAGE="http://pathod.net/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/www-servers/pathod/pathod-0.12.0.ebuild b/www-servers/pathod/pathod-0.12.0.ebuild
index 55b80d96c493..e6d9ff95ef0f 100644
--- a/www-servers/pathod/pathod-0.12.0.ebuild
+++ b/www-servers/pathod/pathod-0.12.0.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
-DESCRIPTION="A collection of pathological tools for testing and torturing HTTP clients and servers"
+DESCRIPTION="A collection of tools for testing and torturing HTTP clients and servers"
 HOMEPAGE="http://pathod.net/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index de8f94f453c4..cc445629b335 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/afb-ucode/Manifest b/x11-drivers/afb-ucode/Manifest
index 0211b15ea3cb..5a7052e056dd 100644
--- a/x11-drivers/afb-ucode/Manifest
+++ b/x11-drivers/afb-ucode/Manifest
@@ -1,3 +1,3 @@
-DIST afb-ucode.tar.bz2 36421 SHA256 6ef1da6c6ff7a6ba07d7cf8c5b3677e353d59b8baea40af05ae0ee56d2befc84 SHA512 f90a9b04e7b01f432bffb3ebe78b6e283c1878512b2310df7a96f982f43aa1aabda952670efc4c4cd3a60ba008fdd4c57684672c7735fe902da88262a68417f3 WHIRLPOOL c6551b602766c815ec55ec7bc1e9bcc5ba62fcf3877a38bca5d4083e6c36cd43ac777bb28f917f1a3cfe3ba185710b800713e6c3adb789f60cf1fbcd888aa1d0
-EBUILD afb-ucode-1.3.11.ebuild 555 BLAKE2B 3d7cc93d4a874227ad45a5c949647119596edc45b285d1003b93827ed48239a3f4c57260e1fb2b50122fe06bb8edc740c0e0bb9ae2ed309628407e951de8b299 SHA512 efee935808faa6875af304344e85ee201c3be4308086db929876cc91251c97dd22877a832a4ca169aaf1c8bafeb99300dac5fabfae9ff835b9efa0e1063fd347
+DIST afb-ucode.tar.bz2 36421 BLAKE2B d59c7331da0ad3769259948dd958a3884aab8bf5f5e7c424382d16189ca4098f96b8d0851fc9407cce112669277e911f98c863aebe595392fa2b6a8d4207e22a SHA512 f90a9b04e7b01f432bffb3ebe78b6e283c1878512b2310df7a96f982f43aa1aabda952670efc4c4cd3a60ba008fdd4c57684672c7735fe902da88262a68417f3
+EBUILD afb-ucode-1.3.11.ebuild 501 BLAKE2B e71535c6c5a184df64e62431ec5b693ac7aeda31bbf02fb8abf73f5015db8f7a1ad09450b124d2074705726b21bcc5f7bc781103cd127f09bd7bfb5ead87e583 SHA512 2c8b39acdc0c5432be2f6f38837e2ce7bf8bb54237d465727d12bcee9c779aa00cd4a2aa54342a833bcc47ce9a09b90c6f02eabf2b3e20bb51d993408dca1c44
 MISC metadata.xml 259 BLAKE2B 396ca927fdc93057fc68b14bbbcc6f8178135988d862c08bf6f213b7137bca2e3588640e8e2b625755236409e36821ae7b7cf0747477a9c2c37cce3fbd406dbd SHA512 9155e5b4b4f6fd684acd0d3783aea6c086855b00e2318b8700ca8ecddaa90aabd0f5a476f6972113f3708ee6741a4e02f04056c411fd8e96e0a9029a3ffb1651
diff --git a/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild b/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
index e7383bf96bf5..230d76f8d362 100644
--- a/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
+++ b/x11-drivers/afb-ucode/afb-ucode-1.3.11.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit multilib
+EAPI=6
 
-DESCRIPTION="Binary blob microcode for Elite3D framebuffers to use X, required by xf86-video-sunffb"
+DESCRIPTION="Binary blob microcode for Elite3D framebuffers, required by xf86-video-sunffb"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://dlc.sun.com/osol/sparc-gfx/downloads/${PN}.tar.bz2
+SRC_URI="
+	http://dlc.sun.com/osol/sparc-gfx/downloads/${PN}.tar.bz2
 	mirror://gentoo/${PN}.tar.bz2"
-IUSE=""
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* sparc"
+IUSE=""
 
-RDEPEND="${DEPEND}
-	x11-misc/afbinit"
+RDEPEND="x11-misc/afbinit"
 
 S="${WORKDIR}/${PN}"
 
 src_install() {
-	insinto /usr/$(get_libdir)
-	doins afb.ucode
+	dolib.a afb.ucode
 }
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 49181b6109f0..4876eca4c9b6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index f3372eeafc61..d0f7f6ac99ff 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,5 @@
 DIST libXcursor-1.1.14.tar.bz2 311896 BLAKE2B 0317ffab4b69de9bf973c15dd81b48bda0e2226953e0f711eb4ac6d487fe75d08873e3392f99ba1478ab99eef43fcbcf319c907535db5e801a4f3e2bd01a71ae SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6
 DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
 EBUILD libXcursor-1.1.14.ebuild 909 BLAKE2B 7d2f560dca312c2ae4ab301d7a175adc9955000ca386eb2a0dd92e6d19118400712523fa30500d79e70cc487cfab9620bb80536db26cc098e73a0015ebaa63e8 SHA512 eb5fad96a13c3791257ca3a28708a81bc28ea43b33fefc9446b91b313aac2901090cb549a087f882da71b29da0f0cdfb1cd84371a6e0408066d6639d45018908
-EBUILD libXcursor-1.1.15.ebuild 914 BLAKE2B 674c6a417190ca628d620588286d5e2c83823256ba2c65fb7d1a4d562ba7498cfbf1ee0121c1a30d6634928d31709a6d84766e048fb3e4a03b73d6db4ac05f8e SHA512 d95507108c8d53896671a5f4aed695b33f8fa856543e348168efdd80c034314cdcf044a9c149c71ccd27caeace4936066507ee1fb5703c528e6dc06c56bc1863
+EBUILD libXcursor-1.1.15.ebuild 910 BLAKE2B b03ba65c0abd6e22b822326e05283e638fd9ce8cbc48fad6445aa5685aa4ca24a5000700199a0a40765c8909dfd56d50fab32ffcd9ff73a4ffdd1c96bd978f96 SHA512 b82b6bb7a971c4ee7666aa03df887f6f3a0d299c96b79a32311e09e1379b2c792db96b5e812334b3251f9e436314e8214a7137b313c29cf66cd736d67c7c0907
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
index d4ad359d9f09..893d691fe019 100644
--- a/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.1.15.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xcursor 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=""
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 3fb3477e92cd..90b1da44d860 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,5 +1,5 @@
 DIST libXfont-1.5.3.tar.bz2 519793 BLAKE2B 1c0ea6d7b14b838445239612adc18927a098905929da69978339da6dc1dbbedefefeb92028b8d704ee16c2061e2ea73bfedb3be3a7faf046ba44ec9cdd739d56 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4
 DIST libXfont-1.5.4.tar.bz2 528883 BLAKE2B d94a91dfa64e6b78bb4cb7f5ce59300b1cf31826308f3b3d29d495e166403ef57ddb8467033c08ea2b7a4fb0b160d25380f49aed79cd6b72a305eab07a0be25a SHA512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3
 EBUILD libXfont-1.5.3.ebuild 868 BLAKE2B 91e94121579fe06d3b12217efe04ab8db60176ec8543ed4363f3e851d520cad2e9c8838d874b56009ddec26ccdc1400f21955266763b323c52c86b52cd8547ea SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f
-EBUILD libXfont-1.5.4.ebuild 873 BLAKE2B 85989ed5834102cdf429766d04d9bd699bd224ce39c681ad6abf820fa1dd3a7c851ab2fb3ec1b5502e2c64ccbf2823119116666be9fc37ea407fbf0e6493a7c0 SHA512 194bf3935c678b207fc121b2041459d132986d47682644fac2ba2e2c3b72be428c08ae7a0c08a13d37fa7186efeff9f6ef9f818454ca25212c70f3be875c965a
+EBUILD libXfont-1.5.4.ebuild 869 BLAKE2B 8164270410304df4dd127cbff3c5a53e5bf24bcd3167bfceb4f48ddc8ac78c400b74e02e86832cebd10ab1f0e637e56016bf59caf515864f404f4f8ae54816d8 SHA512 2b5190e156c03ef203315b3ca3a393e4056cf2023a0f55eaf04176b31dfa0b70241d8e895656e36fdff505b20bde77a899869ab8e869855873fa8dcdf3a5e4e2
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont/libXfont-1.5.4.ebuild b/x11-libs/libXfont/libXfont-1.5.4.ebuild
index 24f758113ac7..a3453b6281b7 100644
--- a/x11-libs/libXfont/libXfont-1.5.4.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.4.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 0885f0047339..1840bc775740 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,6 +1,6 @@
 DIST libXfont2-2.0.2.tar.bz2 476173 BLAKE2B 12a6e4b8e475d35866507e8dcf622b2727f64658cecc8e819f1d5443de6be2bd26f57588ec21dcb725b9e2e7f550800e672a5c120937cde5304a2b81758f6903 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593
 DIST libXfont2-2.0.3.tar.bz2 497085 BLAKE2B 91780c245d5e08b45fca6e940b0fe910b43417b2bed77fa600e0b8ab2b2c5a423b8a1c680349b95592a77f5bac45b1f5a7991d05df699aad080e8c3cf4d614cf SHA512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b
 EBUILD libXfont2-2.0.2.ebuild 833 BLAKE2B d470192afccde65732e1605b745c2c6eb1e3f322da11dd2ebf37e4ddbad28cc0beb5f42d94c5ff9eed97a6f24483ef8bc9c1c47fa0ed74bcb17cd16abc0d2880 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd
-EBUILD libXfont2-2.0.3.ebuild 838 BLAKE2B bff5f566e3e2af96f6dcd1146f8f6b39c1d273f2628d12cfa068296716caf2ffd48e3a62af32bff7f164c6e971bb0317df73c5e81289ef2d0d7d203c4d002d90 SHA512 263951559aefc69c17198a84479f513bbdad5b9b4bad3e422031246324a157ad3d5dc79c6a52c02b5c5fad5c977f04764384c3290cef7a9b547ce096989bea8b
+EBUILD libXfont2-2.0.3.ebuild 834 BLAKE2B c5d0d9959fcb57029a5532eae621f866cf24a0690bd5152d3dabe30c4db0a7bf897f9806e2a85366bf37fef0eb29a5352e3ca9009979814fa443b2d5e05526e4 SHA512 5f1a8451ef935156553adaeb9b6acb067d6edf4590f48278f0910ec4ef017c0b69eb89fc016237dbd4061cbd977cd094942425f59ade8b462d42a2933dd22705
 EBUILD libXfont2-9999.ebuild 708 BLAKE2B a672500d5c0e604e32bcdc29db056a727a2c505bc665633b139862850980dab34befc47ac20c7964d2c20d09aa88dfae2ab995ca597a9e659f1289d9da1feeda SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.3.ebuild b/x11-libs/libXfont2/libXfont2-2.0.3.ebuild
index b4ea0fbb186c..d8da0e878463 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.3.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.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
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 23:54:25 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 23:54:25 +0000
commit	f443475c824b4b5c086e6d040961cb35ad81bc60 (patch)
tree	6a6b4078e5565d11ab153a37a39af2d57becea34
parent	407525b571b48cfd65e1ad7a02d250a927c967c9 (diff)