gentoo resync : 07.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-07 13:16:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-07 13:16:39 +0100
commit: e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (patch)
tree: ee7587dfd365faadd9b297d595c31368bf94f9ca
parent: 2d446203bcf1a0db08e99abca43513d246dfa73d (diff)
1156 files changed, 6479 insertions, 4728 deletions
diff --git a/Manifest b/Manifest
index ec215cda6ceb..0b2740a116a3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28940 BLAKE2B 29631cfc1f099164c5e7534e0ff2294eafe8df4a380c893758556809bd3f480640d80b89fc972bfc59fc32c57c27a530bf512b58138ead27dfbec6605843b2aa SHA512 b506acade375251bdb43d2fe409e32cd5e41c8ecfbd34ef397e9ca42e4514f00dbb910548d9894e4bc46a32cfdfa237328be942cc22255ac4e5eb6aae087b828
-TIMESTAMP 2018-04-05T20:08:28Z
+MANIFEST Manifest.files.gz 28989 BLAKE2B dfdb0609b3959d0df8e3c40061989270c3ce587579cdf5105250e043dfb5d781392a65070ab8c34ee5d4451fba7dc40f524338487686dfdd9ed017db37e93fdf SHA512 6982e2a39fc6284de98b985708f1d0838a8b318bb952a78cacb0e2acb8e9e0e839c5ca4d7a31b3ae32e7d7d24a5d2faad3e6f48f0100090c3ddd2cd1c9110bc3
+TIMESTAMP 2018-04-07T11:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrGgjxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrIrbRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDmXw//RaugNomgN/UFSkcR3ExSyvUgM55k6TpB98vE46EU7dYcC5gAK+BgYeFv
-+0jVPV5jIWwTOHCXWPKUE0vJ/+zQguaNl7RKzaju9jtJCjfdtZxyffqenv+Qnd4U
-Ixu1HZod5Jh3kkJU9cjdS7KGJCd6h7nOh5KYiC+V4sNosniqsGEsdAebTp3NCjEY
-MHgklKLZZClCXqbV5hWZ1f0OHTuo2N9HsZauStnMBCb+OZIKfjBrAIIXQ1Ts9ewP
-Hx1YANC9CvVlQgQ1yEyvt2tt/H9BmG3CwcFXjPhDJjswiOBI/OEfsESLeojdmHip
-YaiR0zgQBj3n7zEe6SPdaYkkvalYlC7RaVI+38KGHRhBhvqJ6gWR0/QjQvzjedrs
-qczWXDvgk+wWtX3cI6OHo4IDQpIPCKWcVrlUpjFud75XHI5Q3JMlWFOMJ6Zecpou
-CsOPtw1tapFJgGOwhdgTQwDXCYLE9K5BEqJ4I6U/ZDxiLWqjmzkvyp+qYSCxGSlg
-07TAou2YUsbUKbgrx6n9Dkxc3e58BxaEwT7SrR3lyL3pIMAyJ6LY635wf+ZclaBw
-lvgw221RvjauukbqoGKdeaSKQ03r0ROIO8w7ut3TeT5/fofHaTQ591Pxw+PPvsSe
-U1bf45PDbYYK/ZKI1gstSzf2bhCtSCtiXyE4SDAcpS79j7AlYPA=
-=ksb4
+klDzvA//dlNh/3n+7zbjrfzp7tSzv1ch6jz4Of+CDo3FYfncLXepZp/2u5t1p5Vw
+qGBMeBgDLN5R5Ns3ljRq++kA6xpm+s7FTNEnI5HPDwZwjx5srIVujGCqKudkcPlT
+GsoTS4AxDjVCn9xy8Q2+NisFqgAReS0Bx5eZI/K2yCgrKKZ1lV4FcREq7K2biI+K
+o3P7gjiSdhklQbTxHpkKoYgyGeS+GGJ+BSFvLJVb48FTIe5wjXvOQrKDt1TPmxMX
+JePNQZrd696Uw0P2sTg+gI7bhxXniVxmEcDE0QnWC6pwY5SQ5nTTGDBR36PA8VKw
+n1QsJbD9YzmSyV2iHFK7IsQ7MQqtz/HKlIcOIYLJmkw0q2dMNIUuB2NRZ1PGYSyC
+65c4y+mRDGRHl3biV83xjdoz/4BUIvD8j4QN4IcrM6KANMlD+gLrFRXCaXjVFM+r
+6Q2jTXAK/dEBmsR9C2ICE/ElYAYtjOCdV6Jpsm7ATKyGzu5Wxvj++ivJ/6DuZ1/j
+c6YZkpYTyUXnUdLk8YxMlT7p+4r6nb8Zhzipg9rDDjZjfoKcLQzyiUh42iEesnP9
+oyNLsHGa+O1rlE71bmzl+udmVSjK8HtUfWJ3VfXhATEAFw9PVY2ibHMBbl2NbXE/
+hXkPT2MyKYyCdCtncYGEvw38TEBC0atqlfolxH2Xbn4uqrCgrvg=
+=Aqgg
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 263d4d94bc42..e16b24a9ddb6 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index b1a3200fdfaa..4e7ead080b89 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index b74f8d9e873c..8901eabb9244 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -4,5 +4,5 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338
 DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96
 EBUILD speech-tools-2.1-r2.ebuild 2702 BLAKE2B 9842d6916cb0e63163c012196f508c0377a473ddaeef30a670e815d96ae30b43a60c838aca9980360c416c9265db32f94fbd2ab9eb150051f43f0b32bd1afe97 SHA512 35d8852ae1e0e94ae7663e489cbb7277efe155fce213d2a323e56b1225950b8455b4e83a824aea84b39a244eebc22f2c6b94820574692c8da276181a57b933da
 EBUILD speech-tools-2.1-r3.ebuild 2985 BLAKE2B 7ed28e6f05a49c83495e85c8f2c8376fdc5eec78fe548f7308cc260174e0dbcb76edfce511a2e1176836a5ca2a7aa5e979a06fc0e2e8d20ed9780089aa02e853 SHA512 90950552bb5d5634bd28d5d538b452b86a9246b92142f591faed49587b010f461721df7092f986dec05081d340222f2d324f899278fcd38fd6d29b7478d95ff3
-EBUILD speech-tools-2.1-r4.ebuild 3065 BLAKE2B 29ea31b2e77cd0b699d7da6153e49086fc8a7b59e9ea4bfd364f6651ac7b1ef82e82b54872299342f8b242a816df50ad77b7cf587bd23167d2c0a5ae87c5da8c SHA512 ccf8bbb6c51fb0e7283568c7688f80316b810a0f63982995ced5d39bd3e7157995c05f5d37e83a3d3cade9c6e2be7909c5736fbeb09ecb7e529bc06d1d2a12f5
+EBUILD speech-tools-2.1-r4.ebuild 3063 BLAKE2B 4c360a334d0ce1ebe0ebd6ee2a2c9767c439cf9da9a187bc3d87ded695dd95c514f1fbdaa16f8391477fefe860b0e17f99353ac341e47b87ffd14c4722f655ef SHA512 dc04bbe5562558eb9bf1b37dcfb6c933e21f01057e2a510554b9eb624603e199535aa2920928a8f1a651eb8c28a486c07106dbb4f07b471d90e8f11c5656bfc7
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
index 3b7f386dbf4d..3fff59e81823 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 
 LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
 
 RDEPEND="
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index afdb354ea6c7..74155090f39d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 61853747cca4..e53108dc3bdc 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -8,5 +8,5 @@ DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
 EBUILD filebeat-5.6.5.ebuild 1647 BLAKE2B de539c0afa664ffb179608e02a73dd75837afdc5564879653b1a5d41c0362dca5b65e5c7b891a3209fb1ecb18b126fa03a4da55ed8287196b2bf14b461999643 SHA512 eae4bdcb37e0ebce86ea8425cacc4289ba311e3f66c50e79b09d3625052f671d24f60fba7dc0be9d8a1758124552cec573b9c843874a0c2e77582c9863d1358c
 EBUILD filebeat-6.0.1.ebuild 1276 BLAKE2B d77562bb3fad920f86ae8a8c155ce161c59f07972c39b546eee8fc723e85ac3943a76fed6a9e6c8ba15926759125f6199a8bc99faddfbc3970c71b35296b96d2 SHA512 d369a624fd8c417059e45ed1b56a848fa8ed1b06d1917f23f251480a29b83847d1f45357e9e7c7b10c592bb94b4d6dead91c98a80d485c3a59acdc8eaa563185
-EBUILD filebeat-6.1.1.ebuild 1304 BLAKE2B 51f498a4fa30d0cb85b1638617f53ba37db3a1d8006476c8820523349b7f484b8b35d30f140b5e6f087483307c0849fa9cbff62552660c88f37a16f8b392b518 SHA512 2f815fff238a665f005be4e741c1c6e128a38d0fb1da3af296a4f38c0c85cbab517bf1aacc8b2161d626ca9094903b35763ace6671a759ec48df882e1602e407
+EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.1.1.ebuild b/app-admin/filebeat/filebeat-6.1.1.ebuild
index 086d5c7ed5cc..c50b43ae9724 100644
--- a/app-admin/filebeat/filebeat-6.1.1.ebuild
+++ b/app-admin/filebeat/filebeat-6.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.9.2"
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 4d6530637352..08590cff417f 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,3 +1,3 @@
 DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
-EBUILD stow-2.2.2-r1.ebuild 610 BLAKE2B d6ad75f18424f88fff14d7546c842ff46b22ef550066b189dd878fbc82607f29f21b7b3a5261a3b0fd42ea0d06ff2b2b668852dbb55b112a9be30ba610e6141b SHA512 081d44d6e5601065b29a1d791a0baa6256f8b5cc3e0c0c9c4dcb0688ae2495581f9b1fe45791148325f14de34a2e92cb6c69c3adbbcfebe453a346984988d1cc
+EBUILD stow-2.2.2-r1.ebuild 621 BLAKE2B 5cd0b3810fd8d2bde5dc13cf5e80639d463bd17a51ed8750d11aaeb75a4ed4983938d3e4faffea30adf08da2432ebf2417fa6b6df071f9a09d290877fedba27c SHA512 0ad9daf266d7a2163a778569d74e45c1cdc506c455ae7ba783ce07b5f4f32f9fb99979a188b770566c8d2e72a10bd256d5900333b8d3bbc7566a05cb828c82f1
 MISC metadata.xml 469 BLAKE2B c09f5d5ad52c89661d6c2b43f1762584cf3282ec9812233df01900ea4b738faf2c66b4405f0d5b01f33016b7c98714cb14fb503f84ed2332596d65ad676217f1 SHA512 d2dedba051ac4de16316392a51e87ea36f435c7f568523ddbd06aa620f4d350edafc6bc996954d9982dd1496951c22731fc5cb5df2725414986281709dafb126
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index b11a141ca91e..553379c37f3d 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 
 DEPEND="dev-lang/perl
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index b7f948522578..0629631687fb 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -24,7 +24,7 @@ AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.13.2.ebuild 4685 BLAKE2B f497b4bea1bfbcdab65fb1dca5e4c2577663b130c4e99075c3b6920e4f2007d9cf899db0f75019cfcca186cf43aad90b07f766de67dbdd4152e8ebfac156467c SHA512 19d1786805b88a121078b9a8ce356320d50539be067ee5ef901ef773719763db8a3918051faf13eb814ed81cae9b066b0857572927ea660986ea06d56a04cefc
-EBUILD syslog-ng-3.14.1.ebuild 4783 BLAKE2B 1239742c75804885aff783ed7ef9948e3337f268863726e458f2740b4c59204def5512301b565f7467afb59038269ea1b2684aee4eaf56e079ac448bf53bd44a SHA512 792ed2978916574e495e150edddc526cd88da38dc3ee62a10777d4703f14adeb7902318f08dec030a342096dccfd9e36cbef92aed3c793c32a8cadcc737e3470
+EBUILD syslog-ng-3.13.2.ebuild 4689 BLAKE2B 4383f97ca7f901ea7837d911409092fb45ca1d09e98c4d584755f3b91d68f1b53b19d08df77912b05edc3d25023873e2e192ffc9c6a856057b306759ff2571c9 SHA512 a71b12aa827d7538503344e2ae6bc8712ba9469bcf18e224a32a55948ef1ff0d2de6f43408b391ff06bbcc1ea1884c0f839cf0de6cec8d1af4d61d66299c3660
+EBUILD syslog-ng-3.14.1.ebuild 4788 BLAKE2B 608ba34c9ed4eee07b80245c723c9b79015a90ae333cd7cbd2e668daec6ed008d80f083be9512a0ce6bb31029be15616914dd03b053363a97bda32fa4fd3332c SHA512 4e527fb42b4f8c486f8a40a3fcded6b88fd84441b5d0283fb16a487ac40760bb755df406643485ad02bbcd0657937a4abcedbc5f42d2bacf69bde077da34aeb9
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index 3f5de6d23d4d..90ffc3bf337c 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ia64 sparc x86"
+KEYWORDS="amd64 hppa ia64 sparc x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
@@ -59,7 +59,7 @@ src_prepare() {
 	use python && python_fix_shebang .
 
 	# remove bundled libs
-	rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
 
 	# drop scl modules requiring json
 	if use !json; then
diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
index cde6394672d0..d7961f4b8c3c 100644
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
@@ -64,7 +64,7 @@ src_prepare() {
 	use python && python_fix_shebang .
 
 	# remove bundled libs
-	rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
+	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
 
 	# drop scl modules requiring json
 	if use !json; then
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 51c58a0c9f83..321f77201298 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/lzop/Manifest b/app-arch/lzop/Manifest
index 6bed22c63231..5be2522d280a 100644
--- a/app-arch/lzop/Manifest
+++ b/app-arch/lzop/Manifest
@@ -3,5 +3,5 @@ AUX lzop-1.03-x32.patch 1345 BLAKE2B ebb5cc35e7fda1578805729268bfe7ba11d102e8064
 DIST lzop-1.03.tar.gz 370775 BLAKE2B c3932c18e13dee788ad405e8241e2366497fae66a7966131baf1880c10974839df12456f6986d975929f7e6005a5dce9887a8af0a2415ec7700ce5b68cf1e100 SHA512 a7a46793e060690f7da3e9dcae8e19f9c3633b84bc6e4a9a7fbf7791361fc7795e00f1d820978b20df8731c165b37244f11203a2936640688e4ade0cc2f5f3d7
 DIST lzop-1.04.tar.gz 393483 BLAKE2B ebeceac9492ce45e6976cd5cde262d9755286e1649802e3e16bfae0abdd74714bf86b076816aa309542cadef5bb65971342208763e1b2761fce2332dc9daa38c SHA512 5829b4495ffefab549aa697a05c536ce593c572c9eee6004460583a0090abcd317c6074c4f981dfee6be61ac8d127f02dd37053b6cb782af64db41586a8bbb6e
 EBUILD lzop-1.03.ebuild 986 BLAKE2B 9865dcc38b15ee7e5847070c9236b638a8c060a29fabfa4584cd6584b7a35b74146fd6508e363d940e70cca68129d8874ea1e2aa1786265278451fd6d6260d9f SHA512 b03d4165485a39768547b2104a7d116b8e14691dcf6acf72a5b4b48ab340d548a917663af992d042c182cb3dbf0d70f47aff8ba9650e154bdb21a2fdbc44c96f
-EBUILD lzop-1.04.ebuild 978 BLAKE2B 7af2ff24c51f441be369c21078365bdc595d668a862fb4a7e8ff954c294b08240e238e0df9dfbb0c38233570cb96a89ea1571cda8ee9cd38ed218bfad5513cda SHA512 a6266a4a84c031aaaa02d2b6db3ff54a177cf4091951c588816fffcc7c5d9780d6592124eec3ea944fe50acc5939dc6d9dcd0284a04e00a46fb5c5732200a56f
+EBUILD lzop-1.04.ebuild 975 BLAKE2B 7759c9bcc59afaa268b5d1f0c059ce97462a48044dbb6bf6fcc1eedeb157a928ed4b36beb1574c0628c458e0312fef274c3f2f826d4462f6f178b9b457e34bfb SHA512 a690b4ff0d1fae33e63bc315a69fad018f93c0b17bc44ecce4df2f6f95f36e925f357ee0cdb3f22d9e2c3a6f255d6f872e88567e9a10aa4a255f2a461565fc99
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/lzop/lzop-1.04.ebuild b/app-arch/lzop/lzop-1.04.ebuild
index a512a7ad9696..48a6342ec844 100644
--- a/app-arch/lzop/lzop-1.04.ebuild
+++ b/app-arch/lzop/lzop-1.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.lzop.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/lzo-2"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 2177e687725a..af1a96684a94 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index 6d4d6a53a9f2..b08ce8aea637 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,6 +1,5 @@
 AUX xbiso-0.6.1-libs.patch 831 BLAKE2B 3be6bfd500f834d455ed0a8f471276c139871bb6876247ae38ccc4344ccf71b1694df67ece512398128202b025976fe0b751ea934201983cb51b20786627e18a SHA512 abbbd8cbb8ff0a2e3c13a6cac2598b42cc213a087e19c46d0665d95a3b394a513009609118cb661bbc207bb6121e335f2d6e755f3fdcba0cf03864bcd048b51f
 DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r1.ebuild 728 BLAKE2B 53be0273a7e95429c45243fa0274f3619258e1927cb4be40eb73ffd5833cbbb4072882f7f9c1721d619b18de3809b02a52b9a4424e473db4676a47b63e7beffa SHA512 635550158c055464dc8f742bda9d5bd89dd2172791230bc4a6958eb4eedfedf610b4d34b778dc9527db6526c59ecc4928019c16d440baa173b8784b8cf732ed3
 EBUILD xbiso-0.6.1-r2.ebuild 875 BLAKE2B 2ad6a7c80b170bc61912b3dcd72df226420a761d2f07d5852b50a04c3df8c42620da0da7970b7d4dccc9f1898092a3d517c076bce8db79e640e94b950256ba14 SHA512 8ac33f6c979abc9d88ed8f71f33bf6262451c0b9ba79e756a797d24393b117f780af8e7c543e5d849a8470f1b2111d3afd19f0019d2773da8e1c4c13f6efafe0
 EBUILD xbiso-0.6.1.ebuild 622 BLAKE2B d6e0ec454d81dd063a60db9d518f6353a6bbc20b783d98196c135f17ae53871ce785cec77cf1cb6d0b26aa6107b816109000768417ed39081e54827591159890 SHA512 c48d49d1fb2a16174d505d70464d90434c1deb45baa86e80e96880b11a55419b5dfcb1ff7f606b595fcd531d4532be288601bb55d68cfd57d28ff7b52e62728a
 MISC metadata.xml 323 BLAKE2B 6a0770e71ff7ea1d4aec6a1c463ef0e61da6e67d233faabe667fb48d66178810bb5a8cb45089aa9c6e9be72a10e88befa475ce12c2c5c5874276011543a67952 SHA512 688b4299ad48494730835903feb951941c1da2a69705d49dd4c64c7d0b8d9f5e6576e162f735739787063db73ff2dff41d5444375181e8488cff21f31c3d89f6
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild
deleted file mode 100644
index e46473adbcb8..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="net-libs/ftplib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	default
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4f6fe1605972..7c321aef1ff8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index 30c0eda83303..67d806fbd5a5 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -3,5 +3,5 @@ AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1
 DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
 EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
-EBUILD libu2f-server-1.1.0.ebuild 1188 BLAKE2B 59052e3f17f8f791706fdc0a1965ace969e642405130eb70d843bbd7e0d1af313a7300cf07b8d5a270d45f6de9cad7899ac41f0661d18201498b619104049f21 SHA512 437f7d002ece509e16b0ffde1d30f751699d4024f570699fc36846a352753fe9b33d3e11f7bee5bfcc35b11b1379b4e774e41f11ed8d5f60c243a46b79ab1b9c
+EBUILD libu2f-server-1.1.0.ebuild 1187 BLAKE2B 27ec974968e6717e3c17d2b89bc616ccf393509e9e247613ab638393d7c1efce5ca3643981c164788b10979b17180c9a87b6c338c0a44ffd58172502e4708fcd SHA512 85d9d2c8170c9566f614247aad94e177ffcea29b7c4e22df52085b5cbf3a65c2f733db20bd6168dc28ec2a0aacc4bb328c296df3d543163a0ce026538f9e08db
 MISC metadata.xml 471 BLAKE2B 7fcdf8c4250dc67abb3e25e21dc602281b4030f38d3c2ed005685d0f9e1446bde39b451bf1240b3f1ee21b1622a01bd46ee838a03159eab24d3ac49a9c828688 SHA512 fd084dc4df2cdfbe25c7818605264e89e430a84f4c74ab1db5d798f510848a1d0208f178b5536be2f86ce3dbd8ba028f34e342363dffdc09f01544f748799db0
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
index 28f5dc9b445a..d6f5837efa5a 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0/0.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl static-libs test"
 
 RDEPEND="
diff --git a/app-crypt/paperkey/Manifest b/app-crypt/paperkey/Manifest
index 57d4f81cb662..b38e04785edc 100644
--- a/app-crypt/paperkey/Manifest
+++ b/app-crypt/paperkey/Manifest
@@ -1,5 +1,5 @@
 DIST paperkey-1.4.tar.gz 259446 BLAKE2B bdc011cfefb7fb6b6359bd1506825d4a65b0110ad302671aced6551bfd54fe4588d4adcb35159e9b29c0f056a1d7e0bc932ac1223b325ff4f04397c1a1d0b797 SHA512 d0e87760bfd66c39c407f59f94cdd3dfd8f399a51b854a2485f923f4f1faa95a40a68ffd018b9141b923c1db346993600e5e3644314e4f8c94585d47f1367e9c
 DIST paperkey-1.5.tar.gz 266722 BLAKE2B 8b838b70690a080ca3e579780af890021f218e86dc73099e2adc457c169d2268795e34779d839b63cfe4fec549f44df058d49a853f9c02a878c2163a5e03b393 SHA512 3abe6be913748c08dd2a8fad1e0624dd77a14972abdc76722507ec454aa31cd24fe9ae9f85e256300e568fbc84da6369fbf07f93ae8520f71c46edae4f0f6fe6
 EBUILD paperkey-1.4.ebuild 342 BLAKE2B f0d8636fc7b87828cf0b9c1c4e01ec5043f4cb7c53a6fcdb269e209cfd26e2c4e2f13d3053d89cbe093391d925219b46db3e91b5395501ac5b975caa71f4732e SHA512 841f89c09c1af3c4e7a05a356bb3f90d04037ab17cd176d2b14f0827f7a26db630b66f3e559dbbc23563d04ad30019181651a4837bf9a72d7e9703f8892e9839
-EBUILD paperkey-1.5.ebuild 344 BLAKE2B 699d27c7fa036981d6c0b1c64bbfa422fcd26b202358204cbc002cda31128a14c0664fbd2335f28f0282278d65caa3d3d8f00020c61ead03c5ce6ad964c892fc SHA512 00dbd8a2b5c837b3d45578a5baac4e7f771f36197f9b7597afea20a283e9e76cc7a29cf07de427e420797d61eaf62201fcb1c0a46484faeb3c9fbc1ce9860e64
+EBUILD paperkey-1.5.ebuild 355 BLAKE2B cf4f8d27c330a6f85877ece6e80a168a07f5383fc1165dbe4b5f25d474815e826abc007191eb873d572676141742a0954a2952e87db0870fa8b12503b0dd2f13 SHA512 fbd1bd7574ad2df006caf82aa49d06a64b9ba990a557be1741581137e22ecdd728cb72778680a9d16a3623938663a559309057d38ed1d518818ba07c60a8fb73
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/paperkey/paperkey-1.5.ebuild b/app-crypt/paperkey/paperkey-1.5.ebuild
index 92d3e57c7bc0..0b743eab0fcb 100644
--- a/app-crypt/paperkey/paperkey-1.5.ebuild
+++ b/app-crypt/paperkey/paperkey-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.jabberwocky.com/software/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE=""
 
 DOCS="README"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index e4caab3d1b4a..0daeee3070ab 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index c9f2add0faa3..39930cd1ac30 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,3 +1,3 @@
 DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
-EBUILD cppman-0.4.8.ebuild 671 BLAKE2B 21ba0ea1aaf32839aa72fb3e7a3d763cb2758dffdad9d176430de0af238204ec20979ced24505513cca3539f7b57cea3874acc1ce637446fc94bb8a11ec85e44 SHA512 38f20c05bbda1245592d3a5bed3676e74a85757058a9238b9cb93a7ddd665037ec6e93e8dc70f3c08d1e08cf1ed1ba1d682a19031e60993bb02fec155f1414bc
+EBUILD cppman-0.4.8.ebuild 682 BLAKE2B 33256eb62816da41ba68f0966dab033a47381a36c14a3905c25dc1f9ad04287eaaff559f11efe7dd6251ae6ac0f22b3c15bb7fbc73c286af8a82b963ed7ae202 SHA512 98290555c2161d4a6a4f5cd81b03cfe666bbf1265f109597dafb74643554c8f4cf2f6064acf449293e5a10f68472c4863e4b3432e9f60f4305f677087c82291f
 MISC metadata.xml 247 BLAKE2B 8da6363de18a0eb4c29efee8c35de35970668cf0107b011b7e885c8d151b7cbd90709f000548025593f2ed5b4bc2d512de53c0285805fec978b363536ccf1ec4 SHA512 a788f5e022a740fafc174856c3fcda9b4c43908303427ecb48deb2198b5c01f1103bcf4965d950e3f981be4036173f9e968e431c49d3df96061f24cdc202edbc
diff --git a/app-doc/cppman/cppman-0.4.8.ebuild b/app-doc/cppman/cppman-0.4.8.ebuild
index eb32dfc0a360..ed07e1b95c54 100644
--- a/app-doc/cppman/cppman-0.4.8.ebuild
+++ b/app-doc/cppman/cppman-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 
 RDEPEND="
 	sys-apps/groff
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e9be1a182c0c..620374731b83 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index eab3b911cc09..e9bd4013990d 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -12,5 +12,5 @@ DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe6
 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99
 EBUILD qemacs-0.4.0_pre20090420-r1.ebuild 1910 BLAKE2B 101e654b4c911d5034418c40b51ed4fd804bca329ac0130beda4eeaa63e3bb7951900561f72408bdbee63adc3d664441439a55ee0ce6a9a8fd4c0ae59bd88142 SHA512 60c8fc230db516b9bc1e80cfac47f2917014db1b36e6f468beb460b5799e4cfba3426400dcf5ae515d007675b55a865c82eb6fdafd91e3b74390e4f7c673254a
 EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9
-EBUILD qemacs-0.4.1_pre20170225.ebuild 1494 BLAKE2B 7e524274024788176b007a8196f29ea3846e23eef4af16934ed4a6f0e2618f021168600527752ee57ade03c99222dfc6492780a0e21015fb996862161e7a0726 SHA512 484c2dc274741df7a4e18dea2ade894a3d104439186c4533c68f169dc635f6558df9f5b08d8b8baa3c9821480b9fbf83b7b3de4f614e11cc109dc86db1d3241b
+EBUILD qemacs-0.4.1_pre20170225.ebuild 1493 BLAKE2B 7f05bee8c264e4c3f246eaa4ce35fc443ba42db076a7fa5eb693ec3d75186824c3a0faa2d77d5d841a5c66e6670f6856818ba1fd465564235f89c591f9e7d9de SHA512 6665d0222f86f4bbd658d8ee754276f5bb9c828bb3e73ea0f9a93b30f7e8300074418d36d88036bcbcb8c67dc31e96f3b38c477003c1e617c781645741c723e6
 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac
diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
index dc55a56850d1..051ef9875f76 100644
--- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
+++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="X png unicode xv"
 RESTRICT="test"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 589504fa3bc4..14b6be29ba67 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index e8369633b2cb..307fbacdc6da 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -4,7 +4,7 @@ DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c
 DIST magit-2.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
 DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
 EBUILD magit-2.10.3.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
-EBUILD magit-2.11.0.ebuild 780 BLAKE2B a58e4c563246229c6e4af405cdaf2ab942a0db2668448e901587ddde4147a6534b2cc5858bf2808ec7241ea6564984680b05f928ce3b94483277d5d7d0eb9b24 SHA512 57ed8420a3975533c6129552ef47b659a198d70c5e243ad61494b3063c1d44473e537359703e07eebf2ca156864f62968d701523edafe71c0c81c2d6a58f9fa5
+EBUILD magit-2.11.0.ebuild 779 BLAKE2B 18d2f34935e2b0d6998a34d7ac6d67a4001b2cf32986023daee3bfbf276dfba2f3a5a622dac26d87e941d1a98d15715ba7da50106d2b223dafbcda6821321147 SHA512 6ccd5423bd59b72ef3d38d73dbacffcd5f2eaabefbdd1bfac8548153f0a59a5be23158ad604c2eef0fd865e285ff003a40d7ea738de63f24f165b5e27bb545bb
 EBUILD magit-2.12.1.ebuild 840 BLAKE2B dc663e17d4a680a69ba19999eb730ef270381baf8b9da2db9733c9817d85e63aaca916ba5d67666fec738e79921f04400a8772096bb490690ab051efaec20b8b SHA512 4c0b3fdff23aa8e09eec41f722ee83ff0aa0d99a24f5bbdf97747e5c4829276bd525fbeb2f71f7229c4a1676b436df241f0bc80a971325e546e6012504448e4d
 EBUILD magit-2.9.0.ebuild 778 BLAKE2B 7063541fafed02cade386a4bd478ce701cde7a81ef05a8b754d5505a17f499e64e2eb5d22ead97cfa4ef034aff548b066492688a8cf692bda39cef66409cb415 SHA512 fe3858a40518be189a482b9ee146cb3154c98ab053379c38aa00528a4908a25a4e48a182af22b8c604497fcbd6fa1e508e05826c55e596686a1a1f2bbe6f262c
 MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-2.11.0.ebuild b/app-emacs/magit/magit-2.11.0.ebuild
index b0426edcd0ce..80fe8ca51969 100644
--- a/app-emacs/magit/magit-2.11.0.ebuild
+++ b/app-emacs/magit/magit-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index f6b3c2818e07..32040904238b 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -5,6 +5,6 @@ DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165fee
 DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
 EBUILD with-editor-2.5.10.ebuild 673 BLAKE2B 28e76191273b926fa2ff32e8a2649081a6f1fe825c3b544b7fdbf2d32d24a731db60d0233c84effd5cb488ed1b3d81bc1cee7cfda5535eaef4a52b8a10b8230f SHA512 de1f447911eab432ea9efc4c6a0dfd6e669bada47c797160592aa446ab26240a303bb887a605e282b5864e32e5f272006713d331bf644367fb0d2bae2fd88c5f
 EBUILD with-editor-2.5.8.ebuild 672 BLAKE2B c4975e572dd90ba5f559c4f055b5761428fe1d1948e35328f26c0c33b4e1bc89078888ecf42fcd8d4bc35816279c377b22d2de0d9ae624a4a9fde5264524faf2 SHA512 b05314fa3013b5e0772dfce3755b97dafeb89549faf91768367b3581506b1c760edec1b9244aa6bd2845ffb62d6bcc054bf648f08fac3901bc28cba3ad88c9d5
-EBUILD with-editor-2.6.0.ebuild 650 BLAKE2B f48f97a175c0c3530348926a6d213837d604224f6ddcf320f3cf8116b58e3671e807b28346c81130ab810fbbad8600229554d3a3df052737a30dbf9a868b889e SHA512 67de51aef7529f56ae3ad2ad1f5a013ed8946ad4c5370c7c7ad3675cd4b3ae6bff7c7f9fce870f463f9c756b8c127df8732007b678267ac67f1bb9ab568efc1a
+EBUILD with-editor-2.6.0.ebuild 649 BLAKE2B 84b6071c66e5093a51677e32c12da8e62863515250d297aa83054f99b392d8d125e7cc5ee911f848e3f332ea5b36c105f5a33f03d1892c0d45e13426ca6e5c58 SHA512 d2076b7141668e11a25f4cebddbb549b9e4cece2fd2fb67f7d53788e8169d7a557a389f482d1cb688615d700a77e94e0854d2b8cec49b0e06b24eca2845cba01
 EBUILD with-editor-2.7.2.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
 MISC metadata.xml 684 BLAKE2B 8deeae00b1046056120a352a462a4c93039275356dd5731edbb0975883f745b0a2b49f4109c89ef0535f97d29a095b803b8e91834ef95a67b479a0baaf518de8 SHA512 9c5cc636acec025b66df91e9a2500a9f5beeefeab3be42f2eb291d3a221151ca1748e80709b3bfac68a800c34cfd954339f1edbb2c9247ac85b4efe47c29621a
diff --git a/app-emacs/with-editor/with-editor-2.6.0.ebuild b/app-emacs/with-editor/with-editor-2.6.0.ebuild
index b4bc6121aac1..b9fc73bff04d 100644
--- a/app-emacs/with-editor/with-editor-2.6.0.ebuild
+++ b/app-emacs/with-editor/with-editor-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f619bd484cce..82fc82710719 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 6c84e273f7b2..8f2f7f176bf8 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,8 +1,11 @@
+AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e04264318fec93df80a5f7f9b4cfc84b9f31ea1185d7752e431d714dd901b168c490562688c124aac8d48fef9c1266d7a8fa07aa06de7e40d08 SHA512 936d3948fd3ccadd4a3810bb8fc32e31e7e24b810e87658e5e53560b515454db6b72b0cda3ace78b9267e197e55181c04fbea92a1656f6a282e29f37d2994adc
 DIST docker-17.09.1.tar.gz 10135978 BLAKE2B 4c2dea48b3593332ac7b02bfcc7bf037b858adf87e5dd8ff84b03aca75d711375fafb06683a6a57cd2549c1a0a0edb2d7c7c1d4cf1b9ceefce18f4f91164b931 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f
 DIST docker-17.12.1.tar.gz 11046888 BLAKE2B f50236826d8b064023e76a6c23a52c307eada73338d25fcc4fd3448a855f91b0f1d3080408bc9e58102467a9605c54c20080773b46851135566b85ce00f7dfb8 SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7
 DIST docker-18.03.0.tar.gz 12751925 BLAKE2B ea28cb4904673c8bbc71add57c880db8593ba68afd40f60029f0b509bde4a61cd1c59ac8f12fd9d3a99571ffaf597745187bab47b897170c54bf9b05d67c0983 SHA512 6385d720a58275d3e415c89f6953b64fdf96c2297ea7a86baf8f044530bb55fef40479e8a018055b85fce73f30dfb36a9904ff13bc12acc6ec4b565431145dbe
 EBUILD docker-17.09.1.ebuild 8766 BLAKE2B 79466ae75ff1b04af6fa51414d0d63b56f400d8c5879bd53ce37a99f824720559c323fad6129da7720ed252c9b5f70d3cb2d63afe25eaa177072272b98e5da3b SHA512 744bf909f82262827d04307bc71f9ec18ce194e3e213ce8f0ebfe172565d84d9c31ccf92ccf9ccadf7457780246427e82cd1f2082a49524e6b35d17ffec6131e
+EBUILD docker-17.12.1-r1.ebuild 8355 BLAKE2B 2635bafbdc6be0840a83717e862b45045c0c30748c8633b76d2913b6497fbf921a24e85580208055ed22eb92c6fd990e1642cac56e41a7149d614d328b65c670 SHA512 e78bbe39f140d48ca9c49ff7efda41f5d531327ec9be528238aa2929636cc59704dadaa7d689c7c34abcab2c869430f118763878a74cecc0bcf73748cfa2cc69
 EBUILD docker-17.12.1.ebuild 8284 BLAKE2B 74fb65654ca7792a04c749b357e513be7e4fc6c0f980ed1061b88a48a55518cb68575e00c1285d8bc5903ad24a767ffd38b4e1090542b81b899c92f2dffaf4fd SHA512 a9c53326a1b8ac22058f4f5a7102c1a9444799aa21f4651c5336f241c17ab46f1e3108618468041fcd5f1c13ffc0d7e4aa1e6f29956de09cfdbd1ccbcd7b2918
+EBUILD docker-18.03.0-r1.ebuild 8338 BLAKE2B 0f41ecaa377dd1337aabece074c4cf77cd8da9355df76fc6dbf31553bbce8ec03c12af8171f3261627604833032dd727e44e6b554887f2288070d3baa84e2104 SHA512 c62f6d9348c5046c51fd61d60b2f234b92d4e787906a83de9b733aa201e9b43b2f13f638bf299181d10e4a7aa803abacaa77493dbe6d7ae2de627d794734b335
 EBUILD docker-18.03.0.ebuild 8267 BLAKE2B 6407b0b3d70cd2e9d8d726984e203c26e0bb897b5494ff925ce7bdbedf8d27dc85b5a659a323699069e85f0cd41674fe793185650c5f39375ec0473f39549700 SHA512 ba878265b53483150d4bd7323ca978143ceed9636a67c14c88b2b2dadb7afea4dcd6623200d7e598ed2b4a1147ff87cb712c741ddbc94fd7463a3f3ce6ff49a0
 EBUILD docker-9999.ebuild 8077 BLAKE2B 8b65d3c59a41acd2020f1a43cf79bea2871fb7b911170741eb3c217e9acd4a5a24b2c2e204e3635cac3e392c72bdafc332b25fe0613991e37cb3d7c55700d399 SHA512 1fb9025bd12796909a623a3ebc9da52e4e8fd73d11f60e25907530fcb62039d7dcf580e4e6f22f103cf1a07aee8bfd6975fa11bd0829952d23613d4ae7ade9c4
 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b
diff --git a/app-emulation/docker/docker-17.12.1-r1.ebuild b/app-emulation/docker/docker-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..8f6b75e777cd
--- /dev/null
+++ b/app-emulation/docker/docker-17.12.1-r1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	inherit versionator
+	if [ "$(get_version_component_count)" = 4 ]; then
+		MY_PV="$(replace_version_separator 3 '-ce-')"
+	else
+		MY_PV="$PV-ce"
+	fi
+	DOCKER_GITCOMMIT="7390fc6"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.1
+	~app-emulation/docker-runc-1.0.0_rc4_p20180122[apparmor?,seccomp?]
+	>=app-emulation/docker-proxy-0.8.0_p20170917
+	container-init? ( >=sys-process/tini-0.16.1[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch )
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
diff --git a/app-emulation/docker/docker-18.03.0-r1.ebuild b/app-emulation/docker/docker-18.03.0-r1.ebuild
new file mode 100644
index 000000000000..62b861abdf84
--- /dev/null
+++ b/app-emulation/docker/docker-18.03.0-r1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker-ce"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	inherit versionator
+	if [ "$(get_version_component_count)" = 4 ]; then
+		MY_PV="$(replace_version_separator 3 '-ce-')"
+	else
+		MY_PV="$PV-ce"
+	fi
+	DOCKER_GITCOMMIT="0520e24"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.16.1
+	)
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	~app-emulation/containerd-1.0.2
+	~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?]
+	~app-emulation/docker-proxy-0.8.0_p20180314
+	container-init? ( >=sys-process/tini-0.16.1[static] )
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch )
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a tarball, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	# fake golang layout
+	ln -s docker-ce/components/engine ../docker || die
+	ln -s docker-ce/components/cli ../cli || die
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor pkcs11 seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	pushd components/engine || die
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	VERSION="$(cat ../../VERSION)" \
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	# build cli
+	emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="$(cat ../../VERSION)" \
+		GITCOMMIT="${DOCKER_GITCOMMIT}" \
+		DISABLE_WARN_OUTSIDE_CONTAINER=1 \
+		dynbinary || die
+
+	# build man pages
+	go build -o gen-manpages github.com/docker/cli/man || die
+	./gen-manpages --root . --target ./man/man1 || die
+	./man/md2man-all.sh -q || die
+	rm gen-manpages || die
+	# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+
+	popd || die # components/cli
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+
+	pushd components/engine || die
+	newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+	popd || die # components/engine
+
+	pushd components/cli || die
+
+	newbin build/docker-* docker
+
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+	popd || die # components/cli
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
diff --git a/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
new file mode 100644
index 000000000000..6bc3fa494e33
--- /dev/null
+++ b/app-emulation/docker/files/bsc1073877-docker-apparmor-add-signal.patch
@@ -0,0 +1,20 @@
+From: Goldwyn Rodrigues <rgoldwyn@suse.com>
+Subject: Allow signal mediation while for apparmor profile
+
+Allows docker processes under docker-default ot receive all signals.
+
+Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
+---
+ components/engine/profiles/apparmor/template.go |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/components/engine/profiles/apparmor/template.go
++++ b/components/engine/profiles/apparmor/template.go
+@@ -17,6 +17,7 @@ profile {{.Name}} flags=(attach_disconne
+   capability,
+   file,
+   umount,
++  signal (receive) peer=unconfined,
+ 
+   deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a subdir)
+   # deny write to files not in /proc/<number>/** or /proc/sys/**
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index facdd6103858..ca57b66a9c78 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,6 +1,7 @@
 DIST runc-1.0.0_rc4.tar.gz 1090513 BLAKE2B 276303e2085eddd549290e3af1a3af4570d0aef43f66f956267451810b0f0fb77f13ed12fe13b76efcd820fc7e0b46eac370a062f43c8600091a807cb12cf733 SHA512 cc2ae38b96f3f3355d9ba26f7af15c57975276aeaf58dcfe7fe5f0f0411ece8584a7cb51ae7fdd2f4109366f55ac8dfb86f225e26377fe07b685bbc56a2518ed
 DIST runc-1.0.0_rc5.tar.gz 1183902 BLAKE2B 46d0ffd9aa79a6f74b3194fa9e1932390115a43c903ae553acb7749d6be41220874a1ff9bae9706b5fecb9495dd6686c38ee1e9baf6118a14990f142baf6f64d SHA512 714230887ff9706c29b0656c5cdb253698bde6252a23e7f48aa690747fb57abd7884c2da1c4d0e314f9f301c5962417351557d15d986e45fcc336e98069aeac6
 EBUILD runc-1.0.0_rc4.ebuild 1256 BLAKE2B 7f7b657ae6f25116fbb7945a4c1e4c3690b736965152be821491ea4fdf4cd5ed5e0b3d7dd1a95607f40706e78f1aadab95b2b5d93324adf0ac7ce94c2cb7b463 SHA512 5236b7ffc8c95960f1590d59bb1dccedb4755aea162c9c5c2cce6239fffbf8a2d951bac4c19bcd513335aa9bff24865f1cb0a1ef2909cdea416d8c18684f96ec
+EBUILD runc-1.0.0_rc5-r1.ebuild 1290 BLAKE2B 124bcbaa0470a6f0ec27b8a3e38f4691445368af1a876e13023f21e02d5f85413b75bddc340a74d5fae410436f81eacba768f999222e76cb30dffed1284746fc SHA512 28a88dbfa37652aaa174e5e3251bc25b758b3bd729f3554fd78cc5e7d7547109bf8602323496270f0d3b40c889b28e42d0a572da28244816f92e20e84a5ea432
 EBUILD runc-1.0.0_rc5.ebuild 1257 BLAKE2B bb72cf75a165c46098384af0bbda4be0aa7be5d5f4bb0fcd7bfdad479e61c3facce28699baf0084359f25dbace8678e5c5de5ce657679047868fe2136132e756 SHA512 f4926dea72c09a49957e9bcc525d1cb9e3e9ffe95d3c9c89ff557c16cc7d37664599461bc58988d4a62608c54214176f15f040736b779e339de62bf043f3d49a
 EBUILD runc-9999.ebuild 1080 BLAKE2B 09034744e5842eb2a340b3095ee3098c58b0853d81ee899b2b8e84c15ffe59638bfc6fb89d158edd4271f1e630c97dafdb4cbe7fb9286049dfe2bbf5eef213ed SHA512 b026b5cbfd44e110a2c2cd72125c757c6b957137fe9491b85e1f25014b564226a3e76c23ea463fd4d7ad742228b2b7bc533aa6b2539b43ca5c37aa2dd07218e3
 MISC metadata.xml 803 BLAKE2B ece04099f6ebb1afd33a01859d10dbb33f9f3606f262c0741406d3611da2f5841ab2e82e3852bdf8b38b8327920218eaeb43925c873a07a5c3a9ed368d408fd5 SHA512 4d628b6c0b34c18b6853d85a83725036a10b65b5266cf4f8a4df69c79882b03ae2a3c9c9ca1fe209998869e222f64efc6a89a8edc9ff3eec45bc9cb4391efd4e
diff --git a/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
new file mode 100644
index 000000000000..d733f98a8122
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/opencontainers/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	EGIT_COMMIT="v${MY_PV}"
+	RUNC_COMMIT="4fc53a81fb7c994640722ac585fa9ca548971871" # Change this when you update the ebuild
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient')
+		$(usex apparmor 'apparmor')
+		$(usex seccomp 'seccomp')
+	)
+
+	GOPATH="${S}"\
+		emake BUILDTAGS="${options[*]}" \
+		COMMIT="${RUNC_COMMIT}" -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin runc
+	dodoc README.md PRINCIPLES.md
+	popd || die
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 180d4fd2d073..c77179dc92ff 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-chuck/Manifest b/app-eselect/eselect-chuck/Manifest
index 002f4e9e3c77..fe955e8176fb 100644
--- a/app-eselect/eselect-chuck/Manifest
+++ b/app-eselect/eselect-chuck/Manifest
@@ -1,5 +1,3 @@
-DIST chuck.eselect-1.0.1.bz2 1268 BLAKE2B 67bee3721eded86a23b68765dfe725bc1bb7fa59f34a7ce99b738dfc5d84f86cb03dd437c2eb6f69b57dcfbb8c9367f158489bb09348b791690d16d97bb1890c SHA512 875c27bb71bdad309554c0541e495d76cac6c663e0c2b3371376f52bca127dbcdc409790a689dee2b2306999eec9ebde6c0afae093891fc151695838567d2483
 DIST chuck.eselect-1.0.2.bz2 1261 BLAKE2B 9d8171538a8846a8b7ab1d932bd03234e4d2e2e99a5bf951e0cca95b5c5a20612e87f0b1eaa8997f9f7ef14aa5f4749264cd8ba52fc858681f29b060f6cadaf8 SHA512 a89f0ed00a44e81ff16b8668cfa23a0c794efc35bbcf5e2f06eb5fe9a56095948fa8ddf36a8a3371fc7ab255f539b563831b527717b58149d19dc0d3c32ca387
-EBUILD eselect-chuck-1.0.1.ebuild 493 BLAKE2B d5692e970c68730122a0610fc7c91128291456ad09637fb848ff26b38232e142bbfd2ad1fb33ad016fe0f62c9233b2d5c7f93d0cefcb174184e83f2fdbf6ebf9 SHA512 a99b4771c52bb53753847d8f35750076232101e8081a1d03e15cbd762a204e122f7b4f7e8a207957c72c64ecb3c8524d1535491329896fbdd56f6956360cb4b1
 EBUILD eselect-chuck-1.0.2.ebuild 515 BLAKE2B 172716d82a21a183218c311d99596887a8225f118cdbcf587ed91b480785dc4cd31107355e23a608201ba45a219f1437a8425c5b96c40c0a3179380e1fea9866 SHA512 c8a1ec0edca6a4de99aed2d63649c9e56f52d41d6a1f1d7ab411f72372d599139934ac36d41594db084e3f33df93e79250a1000bde231ec23887938c6d618ff0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-chuck/eselect-chuck-1.0.1.ebuild b/app-eselect/eselect-chuck/eselect-chuck-1.0.1.ebuild
deleted file mode 100644
index 6f634f87039b..000000000000
--- a/app-eselect/eselect-chuck/eselect-chuck-1.0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Manages the /usr/bin/chuck symlink"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/chuck.eselect-${PVR}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.3"
-DEPEND="!<=media-sound/chuck-1.2.1.2"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${WORKDIR}/chuck.eselect-${PVR}" chuck.eselect || die
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 8f02d3143a53..ce33df19ceff 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index af990013bf60..ae18d2a91c68 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -2,5 +2,5 @@ AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 EBUILD beep-1.3-r2.ebuild 639 BLAKE2B dc9f0e4ce7d73941801fff7c7a872f1295c2b59aec1a076b3700aca6aa21520ac71a104e0e84c60545684120e6d619e82117e8e145e48c803a85887cb7f82c58 SHA512 8efda568f0faa4471f495c243ab64fa0fc360ad6e05fb7752b615a8ecd527a44667a2829eab35413cb0642805abd387e0033dedca05affc5269f68178fbbe485
-EBUILD beep-1.3-r3.ebuild 684 BLAKE2B 261c3dd6a2e90c923f74ba01d66a2d29873dfd411ac50bc49375aa8c672995f12d21757ffefecc41eca0b7c8fc80c79cb002470f774e8aeaa7099c998968228f SHA512 29560fd571aa6ad5d7222223b54330e278ff33c5ad69dd68440333dafc3cec128f3b24baebeff2abd4fda3f148caa79ccd2bca93ba3a5e18557509e5b490e31f
+EBUILD beep-1.3-r3.ebuild 683 BLAKE2B 0c543b903328adadf5148fe6406c9a6a3ec2576a9f22be340fb68edcd7755bd6b0d78242a3b5011482ae01af24176ec650b550dba1e7d756c8c0df0cac1c3ebf SHA512 fbe4703fd86a603b2eefc605e2d634ba9ae951a796985571cc4c7e503252aa397f7ced5d3507f0bf150a5504bf4e95dc58937586930a67b3424aa4e310405467
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
index 123132094977..c7a6706fc982 100644
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 sparc x86"
 IUSE="suid"
 
 PATCHES=(
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index 42c0a6265cab..3c783d753a71 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Added-check-for-backports.lzma-when-importing-lzma-m.patch 2295 BLAKE2B 42ceab5a3b276d9bb0206fc71a4d95e93a1ea8b93e623c7bdac3f846d957586b7522bc6b4a36d24ef182a8fc8623665b17abe0a8ebd529f12d55dd34b200786f SHA512 ad0a89521948ea381fef71c53f2a85e692ac46666fd93a18955f568fca583f5b5685a024152cd774a33df30e9b965513a57139d43db8357836e145d22710c006
 DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079bfeafa63ddb0679c7c7b5d5c29d81dccd4f52e8f6f7d8881d9e672d691c2b2ef367f2bf3180ffbb4ad22dca021 SHA512 373e276a4d6ec845952f1091f85f953d3b0d52d561d9b74a54000ebdef85d13cafc997a4f8f76f25842db8b76fdcd1e602d4d81792a3ea01c9dea6c6ed5c2168
-EBUILD binwalk-2.1.1.ebuild 1099 BLAKE2B f743e5502cc02f448a2a22e3dca3aa77bbc90ecdda74bc4081580e66bed9a4e9deaef2ff0f9f5ff97ae04ac4024633800073cf73f6862bc44f25ca93eccd32da SHA512 afcff195011fa4c8cfb56d82b0984057c51e15919243260b6830ae093ffe11aeb6f22a69602ea61e14d6603db0c224bfa2c17b4b23affd752a3db13f50dcdfa4
-EBUILD binwalk-9999.ebuild 1010 BLAKE2B b9967a0bb5f70bc0aa4358d8491e24ddbaefa11bf2cda79ea845c8c7c08315fa4fecbbb2fc3082ca2b68c7aa746182e84f97db7c9de411e81139a3452068ce7b SHA512 112d781d9aa9e513df88669b9552677a786e4dd1de435eaba983439699167fc2ac185e221a82627dd676ac3f3711c78e79531568447bcf5bb15eaa87b227084c
+EBUILD binwalk-2.1.1.ebuild 1110 BLAKE2B 91138bcad83793cbafed2da690706491f2e4481e35b740123da388b48502a678eefe3d85113ee9500ab85d6dec5639d3efd3153216af78d0dcfcfbe78579aac4 SHA512 77585899a0f0cb775376ea767f4b5f1ae8f6bacebc6d2df7ec4b6a4eb3a293ba3817a6c63be6e3714f386ddec685c921255f806058954f00e0cf56bb15a76f4a
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2b1209d4211d85d9e2b7250234777b81c308a4551f21a2caa91c0dc325ea64034b7e670fcc9f836b3308d83c798a5f3b58b4c260e08b89fd6f78a8470364ecc2 SHA512 ec0c1b3954b6ec60982266666e3a64e989a1cd87f58451df7f2622cd8116b36fb66831bea034eca6dcdba6bba7ae5dada6fe86733150da62d79cc9c72d1acc57
 MISC metadata.xml 1043 BLAKE2B 3c31b5153464d9c439fdcab70b47aeccce5d0a8ec4acb57bf519830b80915bfe3e38dc0d995fc875f5b217bb354bc250043684188a2fc7988948039761204c2e SHA512 4f8c75bff33aee8f04748e52a6c13a866c08b1e0a9e4ff47fa5ccbf2a4e203e1324c6571edc57ce7713a1fc18af3f6d68645a725df84530aab03cf6f87dda5bc
diff --git a/app-misc/binwalk/binwalk-2.1.1.ebuild b/app-misc/binwalk/binwalk-2.1.1.ebuild
index 5bd6562744d1..fd5e23c75834 100644
--- a/app-misc/binwalk/binwalk-2.1.1.ebuild
+++ b/app-misc/binwalk/binwalk-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 4b5c50dcc0bc..4e8eaf67d0ef 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index bf4919e7933f..a92a8840d00a 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 456 BLAKE2B d9aafb782a0b2b8d300450330eefb4c85a5a1e5fe0e60a6c0e5ef69b33b6e00388be91d930885ec7ae39a8222c6ca0b85e8272d86e5226778ab73e339881dadf SHA512 4eec7d0e1c170b86af0b83e35a5648ddcdbccf8850caf413a4b71f604d9f55c8c8d9b0f1178525f3a47f0667243a83473d48437726bf1846dd675e963cb8f918
+EBUILD dtach-0.9.ebuild 455 BLAKE2B 572cadc893cb25d1a95b48c184f61f870711f17874373e2c8e27117b489190b20b817d947cbb509351074cbc7fd8f31a87946e9d31da55dfe014b68f2c0f93f8 SHA512 3afa9818d0e6096de35f60daab40ebec244f22e0b64f86fef53b26de4637295f55355a431dc05756537604898296b3c20714dec33907ca27d852f096fe8a69eb
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 29d85da77d1c..c7f69857e236 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/dvtm/Manifest b/app-misc/dvtm/Manifest
index cdfde30620e1..4237df92afdc 100644
--- a/app-misc/dvtm/Manifest
+++ b/app-misc/dvtm/Manifest
@@ -5,6 +5,6 @@ DIST dvtm-0.14.tar.gz 35893 BLAKE2B 3fc98614f4a8d3013a98a0e2766c2827a5d9f1046fb3
 DIST dvtm-0.15.tar.gz 40511 BLAKE2B cc5075b5337a66b3eb5a3845f18aaadc6be36804e1a0e217e6bfe640893ec5af7553aa69578f8bda6c3b11b28c02ba5398e19f9cad9844bfcb1bd32ca4f24c12 SHA512 48a0c8fd6a50fe5d43414d0223c9f4b9920a31d42fe3bfc428ce1ae7d0e41a41ebe2597eae0824c7c76bfb0e32a13e440c8d5fcdb1886d55d6791fa3fe3fd77b
 EBUILD dvtm-0.14-r1.ebuild 1527 BLAKE2B 43ab1e43a55d399c801e328368b11c31f99111d2573c723150b0afffd94ebf477e5d17b470eb915dae374ff208e99fed8be85613224657567d136472503f08d5 SHA512 5909230c679470ed169370fdec465f07965934df68446dee6c3bd8312c6cd36ad38fb5a728a3396853abe48e191a8e081db38a3707878958517f82e83d19f45d
 EBUILD dvtm-0.15-r2.ebuild 1280 BLAKE2B d97bac0c3363f068dbb02a464db283cb543e326320615b8062f52e265cf9e738dcbae80a60d40901424f23be18b4b4e832bb9f113ddbd77b5523f5fc301f1383 SHA512 5057a1e1d31f940e71abc9befe7bccf5ea913a1679566524d7bb88ec6aa1a5df27fd01299a47b57c610c87875f94535a37b78f85a650ec4a2f8539d7ba04e374
-EBUILD dvtm-0.15-r3.ebuild 1277 BLAKE2B 602b0fa58719fdab4d261e7b4783440d565cd9f9c1f87c7b5903bdfc65522c57929ec845663f473dbf3c565bd6c0aa08a293d79a045ba63f326beea1d0e8040f SHA512 a1d3ecd85b8c6395de79d5972cfaeef45dd1ad23dd61254fda2aac16aa6cae3713013958a7f63438d4a48a1471d0826cf8b48f7b9d9fe07266d0d83cb8f60714
+EBUILD dvtm-0.15-r3.ebuild 1276 BLAKE2B d29b99b61ea839c75886df1ec7db7049b9784680b78f8d697a2ff47e6b76c2deb1297275db285272414af7d4d72902d0b1ce0ccb134f86d1474fe8da5cb5605b SHA512 df47430d1acd215cebc6b94154783eb0b96aa15f77dd92aeb9bfb4b87d169af29f641a077087d46b9b2313cdcc81c9adfeade6f8b2cdfd505b236df9bd8a7a9a
 EBUILD dvtm-9999.ebuild 1279 BLAKE2B 3bfb84aa483fc756132d4a51d1662365cb059393c365781c62ff5e4a462f731b6984dbd1a6f8112132c7738e3e13e596d3a141d9641ee5150538ee15efccdcab SHA512 8511e37e945f0fffacfbacb5a6bb0e850a2e72a06365e1fc4f8ca627d80788ce646212f13abc9bc782cec844d599302249f78cccd50c3e9ac74f0169388466f0
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild
index 1f6287f41cfb..798f8fe14fba 100644
--- a/app-misc/dvtm/dvtm-0.15-r3.ebuild
+++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://repo.or.cz/dvtm.git"
 else
 	SRC_URI="http://www.brain-dump.org/projects/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 17f510ac043a..d6f642d19abc 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,8 +4,6 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre11.tar.bz2 4370 BLAKE2B 9fd957a2558d1d81cefc6f40dfe0c9a8939be0a2ebb1c04e6d13759fc94a28f0c958947e36c4cacd05e0e1c8b995a6877730381d1ee06a75fdeb5142a55af5f9 SHA512 e09546340843f4df01f22c2e5347bcbae7078c521c7e4d5216d061beb93f7ae660e96d1942e6e931e0f72c930b8383cf6f83c70f1f242587da82edc4a04b6d76
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
-EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 914 BLAKE2B 98e4f899ee14a9b79906329216dd68a392f964004ba34ffcf57e3f0ca04fd8cb4cbd77cf265c8868430ee2300d8b971ee25aea06dc9b5132e02cd2a9b69608b8 SHA512 055e5c0398eeb24718b70ba50db43a357d6dd52fcda61304a7023eab93f9c14c1246e69cb2fd6ad02bc69bd2b1b0a53e4a8bd9dbbd52e362bc13a7170a165e9f
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
deleted file mode 100644
index 924922e09565..000000000000
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre11-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
-HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/inputlircd.init.2  inputlircd
-	newconfd "${FILESDIR}"/inputlircd.conf  inputlircd
-}
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
deleted file mode 100644
index 379169e2d9c7..000000000000
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
-HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e 's:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/inputlircd.init.2  inputlircd
-	newconfd "${FILESDIR}"/inputlircd.conf  inputlircd
-}
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 0feb389a9de2..36e34b5616ce 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -22,13 +22,15 @@ AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a3
 AUX lircmd.conf 65 BLAKE2B e63ba72d49e51a09ebe848a63c8ca3865fe7cab40663e58e0c03ec303c7700f27017d2d127d54555c94bcd4a7e996f2cc992ef26acd96f7e5ec39889ce655d6d SHA512 75cea93359a18f5d3f398795904dac4b49abac8bdaf19e06d17a713a3bfc2e5ee154b1f137c3d731fb659ecc245ad880053378a5b5958a28af3f884f5827e228
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.0-rc2.tar.bz2 2552982 BLAKE2B d68639198dd7041865f6b7ac79cb94b63d8a85ee70f97628e27887d14f62814388a51521dabe91730570c382c6bb7edb36c15eba0f8ea9f5d4490dfce2bd121a SHA512 ab3426477f017e3a1b9da690189beae5086bbb52f88d302e6c91d7633f74ef781e6747f6b697b3ed6df13497a3e666f11c846104d2f00b975746d24bfd2a6cd5
+DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
 DIST lirc-0.9.4a.tar.bz2 2292119 BLAKE2B 6ca7562716fde3327aa3f8f9913da7d349969f1bcac095bf2e9b1e3025d1e39176e2fb386ca08bcf80d458262f9eb96dab363ef3aa2c1d56b914ac8a36fcbacf SHA512 16be0ac5dd9b07d717ceba63cdc38c0db4a2bdcfc373ca6346d7cd4ab2cd2973aa7585d10b045fcaea952a3aabf7617c564ccb8268db6c62b172683a4b2cc188
 DIST lirc-0.9.4c.tar.bz2 2311300 BLAKE2B f58f3b3a701e0ae787e34ec65c1d29b0faa75958b95aa43663a78dbe04c1c1d5456df5a6c5e41c673db9f589a7c2d41423b5f6a667fac890fb18f29fd797438b SHA512 0a0d0e025b87a55ec919c92824d8288bfaf35cfebae0ee97d86e344109f584baa72a2eff6d24fbc526900671d6092e0eebef8d1566559b0d153e122e3127c0cb
 DIST lirc-0.9.4d.tar.bz2 2489704 BLAKE2B 89cf8989aa84905d292fdf72632b7e5854aa2b225a6a6183839fa3e5fbc6624474e2723d3456cf5c5e6216abd134805fba495e89469808cd5ff139c31f86c032 SHA512 fb3892e12fbe5277e04c451694f1ea4ed45cc424d66ea57b11c4ac4760afa7df4b37897f380b4ade464a82523a0cee336f216d2009ea9431333fd7ca74a8336c
+EBUILD lirc-0.10.0.ebuild 3624 BLAKE2B aebeafeab813fbe385de6fabe82eff81533030446fd94af464e0a83fe3e6218383a68a618f623851542bc7f6259ba10a73f56541ca8fbc48335ad479434e3512 SHA512 167ef954764d3fab43a3a085367bb8b274b6737b4ef3588db17496b5c36682450d1e1233c7439454211b88d85772015d0dab76afd60cd92693abb12c1d9dd2a7
 EBUILD lirc-0.10.0_rc2.ebuild 3624 BLAKE2B 1729fd08c45514c24a7d48ecdac50b17d9a8d52b95ee06c23af5f5a87f89ccb6704b61d0c6344ce4e28396ec754dfb9ed4a33403179b72ff8060053712f1b115 SHA512 bf10dd1f1fe53d0ffed5e2ed0a0439c8f29d6f291b8487dcd5f74a01bec67b06838c4e35816ad475f0b21f113b65696277f63d13567fd711da719718cd322acc
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 EBUILD lirc-0.9.4a-r2.ebuild 3412 BLAKE2B fee771153fbbf941641b86836d860f9bba1ccb00c834a7433fd48d1fbd51c737fbef0308119db2b7ca61e92b7ff615b7c0b4f0bedc5f9e4908b43db18acf9fdb SHA512 a4fbfa1f58525ba5ff464023b717a5c927299dfc2a57586e19d150de7600e76577004e9398f21cc062ee7e83e90c45f1b3bc8ed9f391be2ac3cda940683e1a66
 EBUILD lirc-0.9.4c.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
-EBUILD lirc-0.9.4d.ebuild 3620 BLAKE2B 863f48ca71a933f76c7c8d307ef2545f54c5d66c9616a6ea171e46faa346c9644a6c1fb881d451b6c430f7111279ed783fe516068464b5c16f0b0858227c4d0a SHA512 f971cbe128d7516d21890f6a99ac581d059f41d769222a736da0779b2b551ec2267a04930faae27faced05549bcf1d725bc260b49c11ee400a7045a412a7ffd0
+EBUILD lirc-0.9.4d.ebuild 3671 BLAKE2B a16deea9b8b715a085d908789d2c252c60b455aff352baf99ac20f7b708713bdac6c3069356072d2b2f996bd99347f4ee1f5552ca670c03a0f9d7e93b3bb5b16 SHA512 466f717db881bd0de70511960c878208efa989995fba7e24a7145c473e8fa81777d191daa2d67789694e2346cd26c7f24f1ff6a3e84300a0cebacd033f7981ef
 MISC metadata.xml 1311 BLAKE2B 4a944ee2bfec572a01ba493924490388f10609ac4c9f6d585e2a7169abbb96e395c181c2ccabe51faa81acb381f259c688bca9a3a217347c4256a29bbf1600cc SHA512 71aad60940c2cdd6e6059b749b6f7e2834dc4146429e78b8b66cc74be32a498f7b019766033baf089f217f95c48dc2576919730645e17d997a37acef058cd73c
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
new file mode 100644
index 000000000000..8ddbc22037b4
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="INPUT_UINPUT"
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED%/}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED%/}"/var/run/lirc || die
+	rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT%/}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT%/}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.9.4d.ebuild b/app-misc/lirc/lirc-0.9.4d.ebuild
index 25ec10062e31..57072953cadc 100644
--- a/app-misc/lirc/lirc-0.9.4d.ebuild
+++ b/app-misc/lirc/lirc-0.9.4d.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 )
 
-inherit eutils flag-o-matic python-single-r1 systemd xdg-utils
+inherit autotools eutils flag-o-matic python-single-r1 systemd xdg-utils
 
 DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
 HOMEPAGE="http://www.lirc.org/"
@@ -71,6 +71,11 @@ PATCHES=(
 	"${FILESDIR}"/lirc-0.9.4-doc-path-fix.patch
 )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	xdg_environment_reset
 	econf \
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index f3094b5c576b..35faf9e102ec 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,6 @@
 DIST screenfetch-3.7.0.tar.gz 60223 BLAKE2B 5b28ec609bdc4019b4b4d13cd70ae7b5d8f31ac5ea22383926752f6e1595e1c8764bff8a65fed4a1089e149edc50126f5bd761069840f012d0b678f95ccba9d3 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
 EBUILD screenfetch-3.7.0.ebuild 668 BLAKE2B 80e3117130dce1b38173d77546cc0bc5e9c7730afe454da952b46ac461c43e7ef6dd40f6a83c88b9b56c5806733bb204675ca496530fe568743e64bdde85564c SHA512 f6d2a7847252534025bc28e068c7600334841329d8d52b5d9039a032400c2054c8f62a2e409c232233f121bdb481d6700dd08b70df83a5fa339f9dbab6c7538c
-EBUILD screenfetch-3.8.0.ebuild 684 BLAKE2B efc15ee760455a8206885a908e9922977336f93e93ad00779d200778b72e1ebfe72336b5489325cba9e860ea107f7c4cd8283c91066b7b78ed8d56ffb1964d6e SHA512 9a78377a310e57e106a16feab5b9958759612cc11b17e751ed2fab9408140f34bafb0954f00c8f946660f59151a9ceaa0c91503a89f9a8517c41c7b7fbf142fb
-EBUILD screenfetch-9999.ebuild 684 BLAKE2B efc15ee760455a8206885a908e9922977336f93e93ad00779d200778b72e1ebfe72336b5489325cba9e860ea107f7c4cd8283c91066b7b78ed8d56ffb1964d6e SHA512 9a78377a310e57e106a16feab5b9958759612cc11b17e751ed2fab9408140f34bafb0954f00c8f946660f59151a9ceaa0c91503a89f9a8517c41c7b7fbf142fb
+EBUILD screenfetch-3.8.0.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
+EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
 MISC metadata.xml 452 BLAKE2B 29589bb06d4930268b6e8e1a2707a9e24d273b9a3bf88945e0aa643960deba4472877366de982f7d857af7c63a90b72edf10fdbfb5833dd71bb0dea0331db6b0 SHA512 f09da25b50fc92fe253cbd2eb32d158e4628fe4d5a62a028fc0437eb2f6e7d6fab7f568c9e165a8f02477dc11ecdec59d764c9d56a779f97d8805ab218741c1c
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
index 517954aa4689..0c17327b86ac 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/screenfetch/screenfetch-9999.ebuild b/app-misc/screenfetch/screenfetch-9999.ebuild
index 517954aa4689..0c17327b86ac 100644
--- a/app-misc/screenfetch/screenfetch-9999.ebuild
+++ b/app-misc/screenfetch/screenfetch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index da61016a27c4..e1687464587c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index f539fa5ebd79..697e47d0fed5 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,11 +1,8 @@
-AUX calligra-3.0.0-no-arch-detection.patch 408 BLAKE2B adff8aade0b9718692e84d8ab407caa3b8b8d279609fefd3daafa0617421bb18dee4ba41374aa0eed5e41e766e7a856e7f82dbec7ac7b4985d7e133fdf4eaed9 SHA512 91e1f5a760f118c3f7abdba1409c8c119265bcf43eef405ec0fdeb7b5b4fd7c0c7e38166acebe4b1766fe276015eb12e6a62743f3d8d648c20856e25c9231557
 AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
 AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
-DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-EBUILD calligra-3.0.1.ebuild 6814 BLAKE2B 62e0cb77ebdbafc0d4dcf5e4e298122f84087dd895d9182b212ff4f040e62b04f52722860cdadf247880b9688d202985ef43b72f59841a2b79c73befb9c69924 SHA512 9fb02a5ab71bdfd24fe1588576fe1f9fbef96e4e3885e11d6a649cee6e44551c36430ae2f4c0693e9de4e5ddf5186713106a56f0b8e4df1efe61bd7711ad7adb
-EBUILD calligra-3.1.0-r2.ebuild 6803 BLAKE2B 6bd8679066ae628bf84189ff92c6a2b8a3695736b5906ea8ad2d50afe5fbfe15bc577409d7010b1482a67c8158c13216ed81a515c12f4b2ba67474c5aa206d7a SHA512 9891067f8c5572ff93beebc8cd3d8b1a946ee68470d2a5d9e3f35682878f26c9d23f22a6dff343b9671ac78c814e4763517a2416bae96a6af91851745cf0fc9e
+EBUILD calligra-3.1.0-r2.ebuild 6801 BLAKE2B 11f72f22bf4fa6ce1c20ceb82f7299a2593d89d79cbfaf60bc18b286bb4afd7e3fe7643bb18349a9a82711ce0384f6456a9c0a8a84fac8c15d517b3192d387ff SHA512 5c367c3f46ac99908708435d2450fcef2e9ac0a875c3d8ddbda97ba11971146f1b71da1a6727292f0943768430619d03d4a11fbda0849b88fe660048f1d15e30
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.0.1.ebuild b/app-office/calligra/calligra-3.0.1.ebuild
deleted file mode 100644
index 7a2d180f4ec7..000000000000
--- a/app-office/calligra/calligra-3.0.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon plan sheets words )
-CAL_EXP_FTS=( braindump stage )
-
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5] )
-	fontconfig? ( media-libs/fontconfig )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		$(add_frameworks_dep khtml)
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-	calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) )
-	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-	calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_qt_dep qtcore '' '' '5=')
-		dev-libs/kdiagram:5
-		=dev-libs/kproperty-3.0*:5
-		=dev-libs/kreport-3.0*:5
-		pim? (
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	test? ( $(add_frameworks_dep threadweaver) )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch )
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-			-i libs/pigment/CMakeLists.txt || die
-	fi
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	punt_bogus_dep Qt5 Declarative
-	punt_bogus_dep Qt5 OpenGL
-
-	if ! use calligra_experimental_features_stage && \
-			! use calligra_experimental_features_braindump; then
-		punt_bogus_dep Qt5 WebKitWidgets
-		punt_bogus_dep Qt5 WebKit
-	fi
-
-	# Hack around the excessive use of CMake macros
-	if use okular && ! use calligra_features_words; then
-		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_experimental_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts experimental=OFF
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		if use calligra_features_${cal_ft} ; then
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
-	# experimental/unmaintained applications
-	for cal_ft in ${CAL_EXP_FTS[@]}; do
-		if use calligra_experimental_features_${cal_ft} ; then
-			experimental=ON
-			myproducts+=( "${cal_ft^^}" )
-		fi
-	done
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-		mycmakeargs+=(
-			-DRELEASE_BUILD=ON
-			-DBUILD_UNMAINTAINED=${experimental}
-		)
-	fi
-
-	use calligra_features_karbon && \
-		mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
-
-	mycmakeargs+=(
-		-DPACKAGERS_BUILD=OFF
-		-DWITH_Iconv=ON
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-		-DWITH_Vc=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index b1da5f430762..0389b5b7c9d7 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.calligra.org/"
 LICENSE="GPL-2"
 
 [[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CAL_FTS=( karbon plan sheets words )
 
diff --git a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
deleted file mode 100644
index 1c544e9277d2..000000000000
--- a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -617,10 +617,6 @@
-     endif()
-     endmacro()
- 
--    if (NOT PACKAGERS_BUILD)
--      # Optimize the whole Calligra for current architecture
--      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
--    endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
- 
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 439a4cbb7ada..bc4f258be37d 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,6 +1,4 @@
 AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
-DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
 DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
-EBUILD kmymoney-4.8.1.1-r1.ebuild 3540 BLAKE2B c414fcdb2e15c26e6c0f8c741ed4660f56ce9f353f3ec57b94a99eb52f686bb57126a9e8ffd23629322cb62f1d244558e28866cc29824573652827cfd62bd65a SHA512 9fd06bd1b03a78612d7db3b71507464ab86055693c66913f947dfa6cb14fdf79d0b380a1bd4c0b4bfea2760eda918700c2229b282af6e5648fd189087209cbfb
-EBUILD kmymoney-5.0.1-r2.ebuild 3042 BLAKE2B c8f5636352b7c370d3b0c33a1eab1642b7616bd019c80e1bdcbffa5698286caa708a276451ecf54738c72d0ba7d829ba4daa7a325cea034391c6daed013d7069 SHA512 79a8756396dd535e6506f61deaf7857a34fca38292854dfcfef7932fbb7a14f0c534ecd3b6bb998146ad7366bdff7d858c9476798105d998797dac8719495443
+EBUILD kmymoney-5.0.1-r2.ebuild 3139 BLAKE2B 8e372597b3e759bc9b2d98b911e2bf0f1ea5b44bea5423ed7b349c29e0642f447f8d68e0024f817260bf80772c5f528c541f39e04a0c27e71620901e4cdf88fc SHA512 b806f365594fdc062993a6b0441f4c918e2178348828a4cdc5b6a9efeea328f6fac2f9b6e81f5ed31b4d55985d7c077d10f034ff825ff80736e803d9afdbb093
 MISC metadata.xml 787 BLAKE2B 090845c035b23d5dd951c6836a154c74736597c05f52a6841596d1d3663085176aae10ae54489eb6152faa82a5c77dbe7001861c63ca1b6191a534022e1be5bc SHA512 19f3d92cb3b3e92ce1692d76af59bc474257948a4740300484f17eecca391b0a4f6f5517fe6dd06d513231706c1123cf1e955ea6fb3a321d2fbc71063da68586
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
deleted file mode 100644
index 34a425616785..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="calendar debug doc +handbook hbci ofx quotes test weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	kde-frameworks/kdelibs:4
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-frameworks/oxygen-icons:*
-	handbook? ( kde-frameworks/kdelibs:4[handbook] )
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	handbook? (
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xsl-stylesheets
-	)
-	test? ( dev-qt/qttest:4 )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ -v LINGUAS ]] ; then
-		pushd po > /dev/null || die
-		local lang
-		for lang in *; do
-			if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-				case ${lang} in
-					CMakeLists.txt) ;;
-					*) rm -r ${lang} || die ;;
-				esac
-				cmake_comment_add_subdirectory ${lang}
-				sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
-					-i CMakeLists.txt || die
-			fi
-		done
-		popd > /dev/null || die
-	fi
-
-	if ! use handbook; then
-		cmake_comment_add_subdirectory doc
-	else
-		if [[ -d doc && -v LINGUAS ]] ; then
-			pushd doc > /dev/null || die
-			local lang
-			for lang in *; do
-				if ! has ${lang} ${LINGUAS} && [[ ${lang} != "en_US" ]]; then
-					cmake_comment_add_subdirectory ${lang}
-				fi
-			done
-			popd > /dev/null || die
-		fi
-	fi
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-}
-
-src_configure() {
-	use debug || append-cppflags -DQT_NO_DEBUG
-
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DUSE_DEVELOPER_DOC=$(usex doc)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBOFX=$(usex ofx)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
-		-DKDE4_BUILD_TESTS=$(usex test)
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile apidoc
-}
-
-src_test() {
-	local kded4_pid
-
-	_test_runner() {
-		export $(dbus-launch)
-		kded4 2>&1 > /dev/null &
-		kded4_pid=$!
-
-		cmake-utils_src_test
-	}
-
-	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
-
-	local myctestargs=( -E "(kmymoney-querytabletest)" ) # requires ktimezoned
-	virtx _test_runner
-
-	if [[ -n "${kded4_pid}" ]] ; then
-		kill ${kded4_pid}
-	fi
-
-	if [[ -n "${DBUS_SESSION_BUS_PID}" ]] ; then
-		kill ${DBUS_SESSION_BUS_PID}
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/apidocs/html/." )
-	cmake-utils_src_install
-
-	# We don't want /usr/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	[[ -d ${ED%/}/usr/share/doc/HTML ]] &&
-		docompress -x /usr/share/doc/HTML
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index eb313fe8717f..c1e3975e0277 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
@@ -114,3 +114,12 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 652636
+	local myctestargs=(
+		-E "(reports-chart-test)"
+	)
+
+	kde5_src_test
+}
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 0dd720d315d4..e0f025bb1c29 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,5 +1,3 @@
 DIST alkimia-7.0.1.tar.xz 38400 BLAKE2B c6dccf0702ae42bfcebfa20fc34233766ab4b08c81d7b8aa8af2be2003560f2e088e922a0ec5656c6f8e34d3f3a8348fb6315c3e5aecf72cda9fa2506e1a2161 SHA512 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
-DIST libalkimia-5.0.0.tar.xz 28400 BLAKE2B 68fa555b1e42bcadcf7aa229092e8a2d6500f4e5d03720dd259eec43daeb7f2916564500d1d2b32c0b36988a8907120404830880a7d10999c3c6b9d010903f61 SHA512 9ba205f5726f237389b9ea928ef37fc3b38161aaec5988dcc64afa3d8e53575a055b248e3c27e738db13f9e6af231f493e1374bbc50d0672729b0cdb391ce99f
-EBUILD libalkimia-5.0.0.ebuild 545 BLAKE2B 2c1264a998140dfe45f7134d43a00c99f11aaf6f8cb9715f78ffa6d5a88d0ea7f40e97b559f626e5a43c8493c14e9237e5c8350a50c624071e977b22d5ca1541 SHA512 cfbf2fa200b38a4b528421e09a3bf6da404e35cf8d5d79cbdbb81ae6f99d3bfe22a0e4bc9270417ce7dfc681ae1bc3cac0cfc05fe2c8940c7ce9f0a54132b02d
-EBUILD libalkimia-7.0.1.ebuild 718 BLAKE2B a685ac8ec2ee5b01ca49212b8aecf9f54f6a6231dba76757d52613fba640ef16c79437029554a200e10b17ead8e32e0cfd6a429f7292b682af8a53eaabe9f008 SHA512 b6c545a93418a51ce07917a63db5131a82376c2f533af100f5d0092ed6636f86aeb6450970359d25aa97b7b93f64cdd7c06828fdf8fa3d849f1438c6f7e2a3cb
+EBUILD libalkimia-7.0.1.ebuild 716 BLAKE2B 1ed3a062482699441aca649c0907f5dbf836c66da3abf9a5fc710abd337683584112d546743932cadd3a8bb8f8bbb2a6048f9411370cb3b5a740a730c209110d SHA512 746880e0244af2c01c48759f53d0c81d4949a3faa9e9f5a5c47414746b6647af67f845eef5c40ab0f2c2676a31cae3fd6566dbd944bf318f7964e4afe064ecad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-5.0.0.ebuild b/app-office/libalkimia/libalkimia-5.0.0.ebuild
deleted file mode 100644
index af907c081fec..000000000000
--- a/app-office/libalkimia/libalkimia-5.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://community.kde.org/Alkimia/libalkimia"
-SRC_URI="mirror://kde/stable/${PN/lib/}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 x86"
-SLOT="0/5"
-IUSE=""
-
-RDEPEND="
-	dev-libs/gmp:0=[cxx]
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	kde-frameworks/kdelibs:4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-office/libalkimia/libalkimia-7.0.1.ebuild b/app-office/libalkimia/libalkimia-7.0.1.ebuild
index 369d414c124c..410a813b42f5 100644
--- a/app-office/libalkimia/libalkimia-7.0.1.ebuild
+++ b/app-office/libalkimia/libalkimia-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-officeext/Manifest.gz b/app-officeext/Manifest.gz
index 173506edaf1e..eda8a1c040be 100644
--- a/app-officeext/Manifest.gz
+++ b/app-officeext/Manifest.gz
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index 60f7372a7f5f..4cc734f2a844 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,3 +1,5 @@
 DIST OOoFBTools-2.52.zip 5650498 BLAKE2B 57a068f1098278bc65d056a98c9047d3391cd732180fb02279d854d10215fec8ef60aa5024e837646738c5ca4f6c60f2205d2311da68eb755ef3427b79c697de SHA512 3da09160422f81be2871e294ddc9397267bf158a6304d23cfa125756c75266d21bb6a6dc5b5ef5feb7afde2979484fd092c555bf14460b43ce215b6c91007e61
+DIST OOoFBTools-2.53.zip 5634554 BLAKE2B 38f3b263ca0429611d8ebd6176c75ef74715dd0830482f8f179f8cc8aba0b01f6e0ece75115d7c35eef9be19b5a247f105d49ba511904df763121caeb964b09e SHA512 7b20ae427c1accff68dda335efde5d76d65f254a30b94d7490913949223501ee5e7099ec672a9e82ac1f5a793fa570bc12103fade24eb4ce86cc3f9f16597379
 EBUILD ooofbtools-2.52.ebuild 775 BLAKE2B 724d8d07d6c34981e0bd4159cf05aac3a3149cb6980735374ec53483deaa8336ec86ea062c0f1ae723ae6e8c8f4795ec68eb6a2b40809b7b32a5e4f1523fdbb0 SHA512 0e76e93b9eda0c190e045edf8f6ae1b594ea5af40c0439b03475a9aaadd8475643a5acc7f7e30136286dab90876aa25e4f8748b118899d7120f5d89771178e49
+EBUILD ooofbtools-2.53.ebuild 777 BLAKE2B 8eec84f111cf368dc3980484abee3c753ab10e5c3dc9931f833b10facb4b77a51832d75348efe22e538326af44d4a7bd5d81d7628eea09426dde263a000e5d66 SHA512 acca4b5a9f0c4deed3a069296ce58e8fe94c44410c242b818bbc01f6609fc322bd96a317122a6993d1f6b4f6db665d82d88b54f22bc5e2dd8f894a683d66c784
 MISC metadata.xml 558 BLAKE2B fd01136ef59f107646bfd319657c23cf75cd2a75066a9ae63c1b430b34e5a30b087fb307a5442ad6c40a16f74a81178f35f216c95d264ef584e10ea4c3784c5e SHA512 45b372bbf351cb6d5e2f984fd8151a47f85f398059ef5470afd671fbd1d0f05e6fb987c94a29c263f4e71283c3cccdab5094cce9b78d16221c2e87045aa92009
diff --git a/app-officeext/ooofbtools/ooofbtools-2.53.ebuild b/app-officeext/ooofbtools/ooofbtools-2.53.ebuild
new file mode 100644
index 000000000000..461fdfddf201
--- /dev/null
+++ b/app-officeext/ooofbtools/ooofbtools-2.53.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="OOoFBTools"
+
+OFFICE_EXTENSIONS=(
+	"${MY_PN}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
+HOMEPAGE="https://sourceforge.net/projects/fbtools/"
+SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/libxml2
+	app-arch/zip"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+OFFICE_EXTENSIONS_LOCATION="${S}"
+
+src_prepare() {
+	# Remove Windows cruft
+	pushd "${WORKDIR}/${MY_PN}.oxt" &>/dev/null || die
+	rm -r win32 || die
+	popd &>/dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	office-ext-r1_src_install
+	dodoc ChangeLog*
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index f7cc32ba1eee..2195a5b1dd1d 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 022318115c06..0ca26fde68f7 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -2,5 +2,5 @@ AUX e-file-20110906-http-response.patch 356 BLAKE2B b995c07f558e398615fcaf74e87f
 AUX e-file-20110906-portageq.patch 1256 BLAKE2B e7cbbc0de5c592b4088d732f4f5a8c03d32842b4a375aedbcac4d82de11760221ea170a19fbb54cc909b4383e693b9ac3a1970047b6aeca0f32ebe10cf7bb50a SHA512 370f74f68888860e8b8d82ea55288c67df45e946e3fc1ff6e4a0c24a4036a045a942347c7eaee02574f7c3d66a6c5c5b3a2208a2c7457f4e7d1fed65e95466aa
 AUX pfl-2.4-reponame.patch 336 BLAKE2B 246570c1c8e77a0cedbac41a9f639cf9ebf1c6c0ed40eb968f4db1c03f6c4cad6688faf86d384b81f7c835438853a43833ff27b854a5d4de41a788934284cae5 SHA512 bb1d4af5b29f070ef75cebd0374fd50556bbc38c8b7b15256c1156dae9887b6e794a0bcc35a199e4e232cae20251a7b74da614779ed589ae9f0420829a5a4659
 DIST pfl-2.4.tar.bz2 6274 BLAKE2B 7cf72dc4b9182b3ea43fb1661330debeb79afdaaab8a519dc2f8f0a048f5f7e66ee2466a44b4683f36eebae248f6df407d0d0fc3914f3a8eb427bc2af0692bb6 SHA512 a33712bc38d6e02474856dc3a9eac0d39be032a9554f2510815602e94648cd6bf499111a3354568788ddcc0a653a2ac54fac56b0af03fb1cf822ec44ffcb1d72
-EBUILD pfl-2.4-r5.ebuild 1187 BLAKE2B 5a967446090b7776eac821306d2706dac343ee14a5c3eadc7b1272cb3f4fd8bfee7662519a83149e8f175107eaa24fa6172ee4e07f065c4079921fe090e83941 SHA512 54aaee896889cfb453d101cea9463c2ff63ab149ccbb3614b08172280db20a45b4a2dac508d9481ce1ba6302ffc598649bc9e704229f6b97b32187920c11e48b
+EBUILD pfl-2.4-r5.ebuild 1198 BLAKE2B f5bb1fc20d4de3e00b6bfc3dd220605148d12888b7807071d499d923133317e10944e941f38c51c96d940578d071487ee5a83fe8cc7d24bdf338c955cd89514b SHA512 146f86054a8d782bf1947ef46b9710155cc938b231aed95e27d917fab8103021592cf5a853e6418927a19c7da4fdbe7297b5b99c96c4152092b43b749cc72889
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/pfl-2.4-r5.ebuild b/app-portage/pfl/pfl-2.4-r5.ebuild
index 6f6863beffab..a803e6e0b359 100644
--- a/app-portage/pfl/pfl-2.4-r5.ebuild
+++ b/app-portage/pfl/pfl-2.4-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://files.portagefilelist.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 73841b8f3a0f..9401efb58921 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,12 +1,10 @@
-AUX portage-utils-0.61-solaris.patch 599 BLAKE2B 29c413891521d234424e4ea68e518f6b4423ba1603e35d9c6feefee546a33ab4e3b9c26936a8f1f605221f1ce71f48d44e437733cd85ef2b2bd26dacc56b5b3c SHA512 e8da9c632f1637cd36c0302b065b03c89be412170354038a8b180d977d03db8a54188f1f920f4a2044696d9f5f008a26465e81210e7e7cdce73ea4c9fe048fbd
-AUX portage-utils-0.64-fix-quiet.patch 1384 BLAKE2B e535a4bd027212281d790d7c423474344ba4d319b888d7b36ef0dbeba929d2d42c8f6f630369bdb4aca648bbdf8b991d8817881cc7289e8f851b603c4659c7e8 SHA512 4c834dbfe66b34517e313fc81587bc9cd19c8ce605e7702e47779723b6cc8284574a7eaad6f38b501f42797d9682524fb999b2f2fc7b4213cf10485c5fbdf24c
 AUX post_sync 190 BLAKE2B ad1a8705af98cc7d0122173e6edb821eb7be6f024fda5eb145d713fb0d43f475fb3f6c8582ecaca88f11852097aa1cd9b866e690ccdc760194a316b72d1ebb37 SHA512 0153d2931c2d2a0f03e74f75dadc14d115c0d0e50cbc43e17c1b05a6a406b4bf47435bd32d1b2f559ce6a576e24a30dcf47e8ea6d346371553560ceb055b4429
 AUX q-reinitialize 68 BLAKE2B f1c2cd5009f30018dfc2d508a627253c08fc6e74859d072b917a0518850b879ecd0318df7a86c8597d28cf4410312f757aaf5cf8780899180a5e2a9a906b1ac2 SHA512 d322fc0e3fd82583e9cfc6ffa95636134e4491e63fc1a1f34dcda58a1749c3ebcda97caee47bea4f44fb056c35c97e30819dd22e5c2ed8c936e0863466ebf6ae
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
 DIST portage-utils-0.65.tar.xz 542804 BLAKE2B bddc1a0ffa52a8d871547e5f4cbbca254e2ac56d84b7271dac127e6be64b13bc0168a7ed256b782b0e844720e536076fe7a7df3ec04a862c85b2501110de2d11 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056
 DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab
-EBUILD portage-utils-0.62.ebuild 2009 BLAKE2B d3e8eb50957fa5481104a2e9ab3158e08d7869b9b5c01a45af40542aeeb46d89d50a19c929f01768c6971c7258b8252691bde1986ee3eeaa6b4ad0dde537cf8b SHA512 89e9460924ec60bafff6f2fccecabc20771d185152007c3fa78c0d8033e1ec63b0797bebd0ca792c7cb77693c4d1cfe4cb24d3f788d69a494bcae1005f912e47
+EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
 EBUILD portage-utils-0.64.ebuild 1308 BLAKE2B cd497cc22dbda169a006b1a14e5264eacd5594ae35d48511e8d605d48d96135f5a3dab037955bbc8b634ac68982d29b31398d7302d8989cab365150400d72fb2 SHA512 f99299e75aa903edcf4e556671ad2653f5d430b1b84e6d8404a4bcd889731c0c180ab8451295f4da62f51a36459e83b993072e54753fbb619be124955bce3cf5
 EBUILD portage-utils-0.65.ebuild 1334 BLAKE2B 6b2c8edcbc9b741884de727da07206f00db0e3d5c039c9d0a0dee3ee53d6ca550df56880ad3be875831c1eb7b7efffda5c373ce1a4e25c731318b0c9a11ae038 SHA512 40ff0725e9d17a38dae97463a28959b52dee0e845027ab35383fb03aaab3b3b7f4c72cf2359a862e2f4f59f42cbb63b36f175b7e874aab0ffe2a0549b25640a9
 EBUILD portage-utils-0.70.ebuild 1092 BLAKE2B dc0f835b1e8e2065b6068fd011f2e6a953f046d366f46053dd534a3621379c68707b4612cbce46f74923a5535b280388c4cd3cc4b691826c08bb87d7c6b00ee6 SHA512 1b4a097f7408ebb6634d4b232ad3dc407b444c4dbb73b8d3b1c6b904cabddf0c3c53b4c51cd008355e7586f248fe663beff3a853dbfb847e29c7ab82c16ed390
diff --git a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch b/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
deleted file mode 100644
index 8bcc9c1b0bad..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.61-solaris.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-qcache: work around missing d_type/DT_DIR
-
---- qcache.c
-+++ qcache.c
-@@ -750,13 +750,21 @@
- 
- 		xasprintf(&catpath, "%s/dep/%s", portedb, data->overlay);
- 		dir = opendir(catpath);
--		while ((de = readdir(dir)))
-+		while ((de = readdir(dir))) {
-+#ifndef DT_DIR
-+			struct stat s;
-+			if (stat(de->d_name, &s))
-+				continue;
-+			if (S_ISDIR(s.st_mode) && de->d_name[0] != '.') {
-+#else
- 			if (de->d_type == DT_DIR && de->d_name[0] != '.') {
-+#endif
- 				bool ok;
- 				allcats = add_set_unique(de->d_name, allcats, &ok);
- 				if (ok)
- 					++numcat;
- 			}
-+		}
- 		closedir(dir);
- 		free(catpath);
- 
diff --git a/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch b/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
deleted file mode 100644
index 447fe3aa4138..000000000000
--- a/app-portage/portage-utils/files/portage-utils-0.64-fix-quiet.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 237d1b34166fea2e4cb0eb28098a5b2759548b86
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date:   Sun Nov 26 23:50:58 2017 -0800
-
-    Fix PORTAGE_QUIET quiet result.
-    
-    Having PORTAGE_QUIET set caused the quiet variable to be incremented,
-    but it did not also setup the warnout variable.
-    
-    Add a common setup function for warnout quiet, and use consistently.
-    
-    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff --git a/main.c b/main.c
-index d124695..dea03a8 100644
---- a/main.c
-+++ b/main.c
-@@ -78,6 +78,15 @@ no_colors(void)
- 	setenv("NOCOLOR", "true", 1);
- }
- 
-+static void
-+setup_quiet(void)
-+{
-+	/* "e" for FD_CLOEXEC */
-+	if (quiet == 0)
-+		warnout = fopen("/dev/null", "we");
-+	++quiet;
-+}
-+
- /* include common applet defs */
- #include "applets.h"
- 
-@@ -102,7 +111,7 @@ no_colors(void)
- #define COMMON_GETOPTS_CASES(applet) \
- 	case 0x1: portroot = optarg; break; \
- 	case 'v': ++verbose; break; \
--	case 'q': if (quiet == 0) { warnout = fopen("/dev/null", "we"); } ++quiet; break; \
-+	case 'q': setup_quiet(); break; \
- 	case 'V': version_barf(); break; \
- 	case 'h': applet ## _usage(EXIT_SUCCESS); break; \
- 	case 'C': no_colors(); break; \
-@@ -952,7 +961,7 @@ initialize_portage_env(void)
- 		xarraypush_str(overlays, main_overlay);
- 
- 	if (getenv("PORTAGE_QUIET") != NULL)
--		quiet = 1;
-+		setup_quiet();
- 
- 	if (nocolor)
- 		no_colors();
diff --git a/app-portage/portage-utils/portage-utils-0.62.ebuild b/app-portage/portage-utils/portage-utils-0.62.ebuild
index e7b698c0d6f9..2ec9b75f23c2 100644
--- a/app-portage/portage-utils/portage-utils-0.62.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.62.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="m68k"
+KEYWORDS="m68k s390"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index de29e7003bd4..294d25e3c0a0 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/autojump/Manifest b/app-shells/autojump/Manifest
index 78a997627be5..cf26d77de79e 100644
--- a/app-shells/autojump/Manifest
+++ b/app-shells/autojump/Manifest
@@ -3,5 +3,5 @@ AUX autojump-22.2.4-fix-autojump.fish-bugs.patch 2100 BLAKE2B 5aef4c4363b0a34238
 DIST autojump-22.2.4.tar.gz 52724 BLAKE2B 42d5db90d4a29c63f5cd79437ca005f9f6382a607ab9284244fd6bbcf539509c5043df71ab305a5e8420ec225f8d651411d327833762737e0a5ad828ac021d2b SHA512 bdfca07bb57b3a2733a2085af14f23c3e980b1b00db1c90247c2341ac73f60f171bdde29dd9917aac0808d0b8f2902d48096c990e09281745a71755f5abc921c
 DIST autojump-22.5.1.tar.gz 54721 BLAKE2B ea3a852dddc13ece5ff177be0b3f384e5dcb19795d31d22edae90dba19fe3e78a4b78f48f08c338521d89d57af6251d5690c62eab445229812adb154286b0d5c SHA512 ed1bb28b62d14a481d5c8ee8ebbfc286d21ca54c961904f81ac123c784e17810217dfe1689bdd4b50fd7a9d72509c0cb13583a9817074f6afe26dc3144f64243
 EBUILD autojump-22.2.4-r4.ebuild 2116 BLAKE2B e354d40e8f165ec2ddfc546ed7a82afe561cdd0ecfe0eff9c2dd8f6ff2f6c4faa5dfe8b884d97f4197399e3110b0635a19b8c1f141b3eda6083ed44b199df58c SHA512 c2a3239a7ba6ef8ec144ed271824e9b839b709ca2533d68d12499af0f3281cafb1b34ff58d8f85e9cee366f4674e46f5bfaf66be08b6038d121def8c06f0cb6a
-EBUILD autojump-22.5.1.ebuild 1940 BLAKE2B da040ed8ff5694bd76a6a4f0e6fe5bcdfe90fb9be74f9a5710b4d2daf2b102990748fc1c9c9048460e68885c0876a81878dc9daade6620d17d877f0c6ddabe3a SHA512 54d29a51414cb029c78eda26de8e8e9a5f887aeb67a569f5ad8f22e44694a6276600f0cb1a249a4524bb7e233241213091ac0ae533fbadd7e3413ab10ded2c47
+EBUILD autojump-22.5.1.ebuild 1951 BLAKE2B 1eacd3ff45cfbeeb923b5deb5b1faa23caadf4d8ce769fa91ae63c22bf3e2e76791a39f9e1b909119e97285b26369a50dcb0ab104befb8561345230baf4d51bf SHA512 d41fc0f7bac8ec6966b01bd78733680468fcb3f5cc9161c78c42ecde6bcd3223f9a2a6b81aebcf48f8b1b630f48e625c03f7a86fe80bebb97a7e3568113fb427
 MISC metadata.xml 503 BLAKE2B c2ead3167237d69f09ac2e5ebf8920b6ec2cf8d3800daf5aa8ce474067aeba88087914c39346414d707c3440c18592cae6d2c1e42718991bf41428a65136d733 SHA512 5173d3dcf39215a8ce67a9eb37127f4945d1420180a48f952d417d73e83bbd03fe1cdcbbb193b69f5eec3cfb994c12f8a92b4e6e22844b30753024dc0919a10d
diff --git a/app-shells/autojump/autojump-22.5.1.ebuild b/app-shells/autojump/autojump-22.5.1.ebuild
index 3b234c08f3ce..a5865f7617f0 100644
--- a/app-shells/autojump/autojump-22.5.1.ebuild
+++ b/app-shells/autojump/autojump-22.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/wting/${PN}/archive/release-v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="ipython test"
 REQUIRED_USE="ipython? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index b6b676027ec3..0b67c4561044 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -3,6 +3,6 @@ DIST bash-completion-2.4.tar.xz 276148 BLAKE2B 1ca38db1d1ad9f0bf7d1aa4e49cba1c82
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
 EBUILD bash-completion-2.4-r1.ebuild 3161 BLAKE2B 0c3b185bb625c951f47fb9571695ac67900d67868a0bab27d1a80cb15a31e997422fa8e43677f4d68c6644e10f502c25fad166e1ad1257696c9795bcdc2967c0 SHA512 2d6366a7609d3fab9a423fac06e2c78957f079c37a9c69d9694dac6f70ed50d4234b14f4fb54dda303ef916ec6f92402179b6bb2830208d83e6c5e98bacfb693
-EBUILD bash-completion-2.7-r3.ebuild 4116 BLAKE2B 686bebd92b1668572f7fc1681e62d53baa2bce0527e20b57f98e066c6e1c39455690840fd9f357780552891925c42b8575b54c4f3d1697c0a279466fc89dd22d SHA512 6c4c58c8d8fef22612cfee44d86f3d3b951561d99e73f5158913235a1e074433c88b9a87aab7bc33a5546ddbff58a43037575a99c63e744462d507fd9b822cea
+EBUILD bash-completion-2.7-r3.ebuild 4115 BLAKE2B add51db8aeec357866a04e9bd3847c1c0624e5f3471aadd014b0d58475ab8a1b7ee59a5f9a8777ef4ef162958b969f4a6fa46ae75466917b92bb03397855ba3c SHA512 bf138c8f7bd20fe5f1803a6b96b435ec2b0f7b5be28b2d14aab545425b8659d254a4bfca8e92d687266730ff75479b1e59f69cfc022c582cb094852c4ef1a3bc
 EBUILD bash-completion-9999.ebuild 3911 BLAKE2B d574df4426904b68d44dbd724f0dd60e5b6b1b46ca5b2277c6095f8f21780e660d4e7981cb581d51237ed728f9f5837363fc2e05ec7b523f1e0c38c6c680b0af SHA512 1defdc4182a89d0d4a1f6c21c411cf9bbd4cf92b6a86667b29c08dc2112618e33284fc6ff24bac5e0b306edcc207a5538d911c0fb1dff2d01fc67c995d3e3d70
 MISC metadata.xml 1309 BLAKE2B db08060cd74841bd7220e688e251225ddaf59e4da737c08785e7c6ce83c2d40600fbe38e9b9449fb559ccb2d03b8c2368295b647ec2a52191429fe1d3d1c7470 SHA512 3ee23fb6cbee1e80a0c8fab13f7bb67bdad3292fa8ec187e306b00804a7bf709358c8c08eda4101a5f5baa408e0892aa94c07ae466b5beae4edc18055b1192ee
diff --git a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
index 3cf25d6764b0..d9796eab2f1c 100644
--- a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE="test"
 # Multiple test failures, need to investigate the exact problem
 RESTRICT="test"
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 4a53fc660a28..e6d8a9502bf5 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -3,5 +3,5 @@ DIST fish-2.7.0.tar.gz 5760470 BLAKE2B 8b3b905b6118cbcb988cedb1e80bcaf0e69d3d27a
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 EBUILD fish-2.6.0.ebuild 2101 BLAKE2B 58ffb1a0240f07c7b84cdd09aafcde2fd5315bc089c6b0408e741e2ff692181910580c6d35b6ed7116eca4715d8908ea9283b1721b1ea6144ef397eb063e6a40 SHA512 300260bdc26e6e17ba5aa0ec8e1cb96b9669e43e83d92b98903ed79299ce6a350eb12b626ba5e6882138f2374107a2e7b9360a1012ccaf11578664f1270ced61
 EBUILD fish-2.7.0.ebuild 2287 BLAKE2B 483123e3b74e45e1402195ad971e26bb36f321646e7ac6298cdd29f8f6ff838f0fef0f255bf683bf37825164ede42d7823c9a6dad4253650a2e59f4404428979 SHA512 0ee5c9aec58088fb471c7212c48ecb9d8453983027e959d7ab5bf983f3c193fa8267b1f179ac02f33645f1d7bcad80fb1798c4df6683f811a7dd7c2a9631b7db
-EBUILD fish-2.7.1.ebuild 2158 BLAKE2B fdcea483a1f2f4833d5c5140c7c04bb9b1a8cd40c9eda9754f4e120337cbdfa64acc3662a1aa2496cc8aa44211f8ed62de1ee3f30c55a8d161e466c89f975678 SHA512 42131b864eaa1b29d53cac411e60f277d1873e6a7a7daa607f16d05f2f6ca11cf56443aab63f9d243c2770650876993e2753920f4765de0efced5bb89ce9f9c1
+EBUILD fish-2.7.1.ebuild 2169 BLAKE2B 5d513aa92737d6e58d9e0558a1c49f5b3a81faf07191ffd15f2a9420c0e56012cbbae29e78a226e78812f5fa273a8fcacc61d807f1e1a3d1db4bcb856e33ea88 SHA512 9d276f9b4fe9c3880f514cb487566380dd11eb715e6857ce2bb40c70c065ea93791d5bbdcb2bb97e769ab2cd1cb80c72bbad5c3f3a1413793d89b83262f1f928
 MISC metadata.xml 733 BLAKE2B 5397b2e1714a6089ff4c263025499d5231a179946a913db582309b52aff118a3a853399107da99f2469ad3fa80b1b9129a4eeaa5293b4430b0f08abbe1f48f75 SHA512 92cba131da5b8684008868f6fcecc62b91ede3ea2271ae2af5e501728b90c63a0227743d59e255ba16dc0d4ef2d8ac70b702be184db6f91ba4b335ce04be3be6
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index d3fe5a15f71a..d33a4f6cf288 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_* ]] || \
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="nls test"
 
 RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3a96ca3568ec..1737902a1c92 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index ea9bbfb017d6..e8ae572deaf6 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,3 +1,4 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
+EBUILD lesspipe-1.83-r1.ebuild 1134 BLAKE2B 0593da935bf18e040e0d9859e051d867fde05644ba39b7c71bf8ac6a60e9a5581deb74fcb3884c0370e7947f23a6b8802bb6c53685dd2c772139bda286252d49 SHA512 dd9ef9aab18b1b1b3ce69436963ccd577fba41c9e6dedbf69aabf7c61093bb04c0b2ea3bf9e62e25304f8008ea81730407fe410c208a85aece54e6d4a05c400c
 EBUILD lesspipe-1.83.ebuild 1147 BLAKE2B a6d4741acd7713b6231dbaedaacef655a2ac1cb0bf1df903dc771318e42cecb5e6001d3aff9c8d46c344514e9d00112d469aa65e785b7f474be520e671acff67 SHA512 a20258832d481689afaae1a9ac9234ce407e6d5746617a159bb49452bf82965f25039cfd5e65c79175039808a08de30aef7d3c8898ac9a5ca548d838b2489085
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
new file mode 100644
index 000000000000..92d625cc3641
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/rnv/Manifest b/app-text/rnv/Manifest
index f12f385b5ce8..9404d1a8d19e 100644
--- a/app-text/rnv/Manifest
+++ b/app-text/rnv/Manifest
@@ -1,5 +1,3 @@
 DIST rnv-1.7.11.tar.xz 140904 BLAKE2B 01b4400cb5bcfbc850f58d5b59ab8259532926f436ddfa20c63ab35cab30a30ae8429b82be0c589b694a12a9558436a1a3c445a42734af84ca6b66e5f6cf6796 SHA512 e706ae6cc9b55032b23c0ce4ce728f426727c20d0291f9ea4369221c5b3d59f29ad477c6da4992a9bda7c583078498faabc06a9865081517aeac81b2d2fec212
-DIST rnv-1.7.11.zip 211316 BLAKE2B f73026b2f2a2f1856944daebaa1c35bdc34a93e5216fa291b4d26977d129ce37b74e051a553673e9713de82eb703307359272a128db5e85c8225dd5a773b19ed SHA512 0d9457015e35177144eb88f6d6234e8d94c3a5a45f26f961b4aaba892bf92c0ddcaf0e037cf3fbbeecf110399760e182c20973e6ba32d1223d2f82600582a28e
-EBUILD rnv-1.7.11-r1.ebuild 656 BLAKE2B ac79b8875e9102dc4e2f26b6e050f44a96fc7192913b354f468ac6810e8e6a641bdc345d76c9b3dfcf88c8479753ed068145a8d26ff36bf639ff493f3e6a8186 SHA512 e7ca81277f29dc00fe8ac7571aa4af7e86f21111eeb9ceb490f5537d32c56a59f7710fd206b8cc80f5713990c8cc37b89dac942b7675907aa2092a281bc231de
-EBUILD rnv-1.7.11.ebuild 571 BLAKE2B 72b673ae1e9446d7be1289470bad13f4ae3317bd96e955dc9988c7909560c04341878f68a67f5faf644525b045294c49cb13d097a62eea2b52b2977fbcaba10d SHA512 4ed203e7747a2c3ea0da330cddc83e28eb177de7a8e709f5c894a7b052d998b02e53fb46c49b3d41c9e1b2d921d9c8bc0679f265ece88ebe4eb9816e0ae099ed
+EBUILD rnv-1.7.11-r1.ebuild 655 BLAKE2B 2a8928f2bc8e0de300bd5f1145f647edd4915dcf2952204915790b61468dff6aca45200747995851e0a89d932ed07b28e6021811e5071aff44b2ec6a10f71ae9 SHA512 bb16825fd60d75691432910e5fbaa732b7bf9186e06c1ac9c0353df55a7bfa4ecb6cd5e36ed4603a973567df5ad9372fc5da73830213a1ccc2bac9e81185d7ff
 MISC metadata.xml 239 BLAKE2B 8d54adc4713f80a925ad0590e17bb5d790690254160804e1d05bd2d257843af2a9f7793f041c140e76727f9bfea187a41933b9e4fb6b76bc889ff8bcdfc443b8 SHA512 7eb6bf1beffa771eee5c4de5dcf2ba3966398fcf6ea009eaeaa1d73cbdfc3d38907b8fd3c711144089b2ae506bcfa394f76ffd66238fd7df8e2f95589bb2f5f9
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
index 4321037e0b79..1ca31dcce3d1 100644
--- a/app-text/rnv/rnv-1.7.11-r1.ebuild
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/rnv/rnv-1.7.11.ebuild b/app-text/rnv/rnv-1.7.11.ebuild
deleted file mode 100644
index dc233fcb9c40..000000000000
--- a/app-text/rnv/rnv-1.7.11.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
-HOMEPAGE="http://www.davidashen.net/rnv.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
-		app-arch/unzip"
-
-src_prepare() {
-	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
-}
-
-src_install() {
-	dobin rnv rvp arx
-	dodoc readme.txt
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b8525ffad5b0..e05dc094bee0 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index d091afd890f1..5d7d7c37bc12 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -1,7 +1,3 @@
-DIST mysqltuner-1.2.0.tar.gz 24562 BLAKE2B 7bb18e4ad569b1ccb89d19d26dae2b90a37366da6f19c4bbcebc6e02aaa07a931abe182a27c5488068f99dc608ce46d5b2ed97c79a593d659736a0e18a639d4b SHA512 b38277c31c1a870525f20bc1c023fe9675403834313a65c99c445a5fa1048c7aa3dc8ed5a9a9255c4844bdb001b28ee45be807306d0f1739c170d8ee9e0ab53f
-DIST mysqltuner-1.6.0.tar.gz 53424 BLAKE2B abcb2bad72d1186d510281720850a1ebe72550d211df4486112740860e9e538d914bbb1f0c6edada3ffc8fd5afb0c175242747d093fc319e57424e1e4fc8dad7 SHA512 904022ef64eaf75f3294a9a5123dc5e00482d95378722df63140bc6859ec245c32d9b06d19955790a5e29b9335e6da3df2cebdeb4659cb9058561866f6ec69c2
 DIST mysqltuner-1.6.18.tar.gz 169074 BLAKE2B e138e29db2f0b1abf88b2d8268732fd9f05043abf320d8d97493d6abb3880e5664eaea39392406297e3125789ffc172f6347922ba14a00af16beb3f6f8080802 SHA512 8067b7ac4a4fe7398ee2cdc463a30042f46972f97680b49912dca46fd1d835989aa4115568dbe5473ff28c4d956bf0ad70537318db788dd56bc93ad220e6bcb6
-EBUILD mysqltuner-1.2.0.ebuild 610 BLAKE2B c873ff07723563bfe328f8e85344bf13ac2198301df221a428d9df44624560b3153afc6b3e4302b7559231cf3fa7b7e1e6cea808bb5e396805fbd0375a494cfb SHA512 1c1b7b88aab98615706e5593d325cdb437028bda1a5d2ee7b82d987e9146c0a7cf8396ff87e7ed96aa90eb9075a4291b19960dd27e50cd8be4284374d5785df4
-EBUILD mysqltuner-1.6.0.ebuild 745 BLAKE2B e20d3d91ab9bb85faad0f53c8b2a4fd7c7e10fe02f5847aef4a5d6195f0208b6c286d2b82a28e0ffc1f67c5c6cce4f4323cf7dcd1178bd984cf09dc0a5d7e813 SHA512 2a3d3c301ffe70d15c125e279970d2ee2aa9a28e3f7146a6fc0c6ba15203962c1405839996df9eb0c35ef5ecad23993cc49d7b5645f17611e9b2bfaa83ff3e16
-EBUILD mysqltuner-1.6.18.ebuild 820 BLAKE2B 0b6ea1c654fc05c86f08fbd6b02489fc3fb31dc36594475147293f14c36d94c2b6d558c9405e78498796f27479ad6ed67e4c8c028a0106c870e6c39c565e88d6 SHA512 f9a2e5d75d05909c22f2e78deae3f755f61342c0b5edc02edcba247e3fe65ec496fec71b7f0538fa33608e8dd2f44873b30f5e0eef7378a1f94d1c12f311e937
+EBUILD mysqltuner-1.6.18.ebuild 819 BLAKE2B 28fbddde037358d38eac70b778e77e255c3a2fcc812652ed42bd3482bca055c81beabd4bdb879d08b05cb15c6b9a5d036a2db0ecdc032fefbfcca8d5b7de1a48 SHA512 097e8b3cecb29cfc084d73befee963c656b017202f048fcd04d8b2a7880218500fd8f52a7b72edbf5f4fa8f8d3780924d8fe954a254c048d6b4f8264f9107dea
 MISC metadata.xml 329 BLAKE2B d077c83fc6fa3835f649af5c44a6f2390c2a0c7bcaf61fb5c6817e828b1a4589511a45217b991d3b9abb1e916ff36ce4cf5f906d45bc3ba99d3affc3327da1b5 SHA512 3bf9adc56a18f131c90d2524e83bb1e43a2cf49286e2c4c215cd95f1ff8792e0a4e325a36350a95e187396e0aa39640238ab57f57682c914e97c5663a815275f
diff --git a/dev-db/mysqltuner/mysqltuner-1.2.0.ebuild b/dev-db/mysqltuner/mysqltuner-1.2.0.ebuild
deleted file mode 100644
index 76e32ad535bf..000000000000
--- a/dev-db/mysqltuner/mysqltuner-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script"
-HOMEPAGE="http://www.mysqltuner.com"
-SRC_URI="https://github.com/rackerhacker/MySQLTuner-perl/tarball/05813a1faa447fe16c2a7efdab9b22c3bcbc5485 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6
-	virtual/perl-Getopt-Long
-	>=virtual/mysql-3.23"
-
-S="${WORKDIR}"/rackerhacker-MySQLTuner-perl-05813a1
-
-src_install() {
-	mv "${PN}".pl "${PN}"
-	dobin "${PN}"
-	dodoc README
-}
diff --git a/dev-db/mysqltuner/mysqltuner-1.6.0.ebuild b/dev-db/mysqltuner/mysqltuner-1.6.0.ebuild
deleted file mode 100644
index 8f6371a0c1d7..000000000000
--- a/dev-db/mysqltuner/mysqltuner-1.6.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=MySQLTuner-perl
-
-DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script"
-HOMEPAGE="http://www.mysqltuner.com/"
-SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6
-	virtual/perl-Getopt-Long
-	>=virtual/mysql-3.23"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	newbin "${PN}.pl" "${PN}"
-
-	# The passwords are meant to be fed to the script uncompressed.
-	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt"
-	dodoc README.* USAGE.md CONTRIBUTING.md INTERNALS.md basic_passwords.txt
-}
diff --git a/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild b/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
index 02ae046adc48..6977a21572ee 100644
--- a/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
+++ b/dev-db/mysqltuner/mysqltuner-1.6.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 1517a327599e..e1c1224f47c0 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -3,6 +3,6 @@ AUX sqlitebrowser-3.7.0-unbundle.patch 475 BLAKE2B 1e2783eec7d7c054d18920fc88617
 AUX sqlitebrowser-3.9.1-cmake.patch 774 BLAKE2B 5773d3f70bc45348a4e3fc35fce57ad7eac416e7cc4d94eceb31ecc5e0ca2ed9dce837c299083e800b1ec7d80bd67d10ee60cf44c5a6915f39c619ef07f048f4 SHA512 f1a64286036d5c05e279fbf430f55400eb8f840564c0d9460424a42f87c4bd8d4f4e2c52c39e07d0bd3a50fa4a1e59bf591c53b1d28d2ef367af2ba25edae299
 DIST sqlitebrowser-3.10.1.tar.gz 1992186 BLAKE2B 105333118a404aab48abe5ecbe83b425109b60adf40d3a3b7766c7036954996539bd133da4b3e3b1e2d819223842d107710b6b24aada6bb298462e062296dabf SHA512 da9650fff6cd7984e8f438b254318b5da46209eb21a375569ec1b4dd898a41d99d61d6682f2979a56d5c39d552ed42f443215900c1cebe95350e4624415f69c4
 DIST sqlitebrowser-3.9.1.tar.gz 1704713 BLAKE2B 447a9e20fe4236feea2684703ac7f38b1c03f0ded352653b41bbec7d6380691776177fee1428fd67ac96190ed6752cedd76a9883cfa12584fec464cbf98707d3 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225
-EBUILD sqlitebrowser-3.10.1.ebuild 1380 BLAKE2B 3b7318374706616863cea99049f8108ee3fefbf779042ab397d19ad2a8d056386af566860b48e816955c1d1306be057aa5e786fb9596c54fea2d234adda275ef SHA512 8f9d0ec924150591d8fad23370a02b14cd1194cf1d455a366099254429f06e67e1397135f4d16fb6df5085d3c459bd73537f11c787e5e725f7986064fe46b19b
+EBUILD sqlitebrowser-3.10.1.ebuild 1379 BLAKE2B 9c641b6bc94ba48d38c7075f094dcb2a90e3ef28d440579239d2a38bcd2ec74ece842c09b596aa8416551520e8012cd2abdd1f2fe78a4aa0b11a87bf3ebe8bd6 SHA512 93f6bf3d44799e9f5543977115138701249f4e153ee8265e3ed9d9476e5cfa07453c303ace22f327675a19c5d5e10f6e257d36853f7db54e2f3f77020c02eeda
 EBUILD sqlitebrowser-3.9.1-r1.ebuild 1439 BLAKE2B 355dc9a6af52f1879559b7774d93f226e46a9998de3557c0f52d2b8ecde160e9c777bcc7ac4c8d33d74337972d6def9ada5d404b36d456133df000ca552623da SHA512 ad218ab7dc42f42487868aeba8fef1f282369bfc2508e6cbd20f0da1c6101f93ff3b157970e34046be20dfd98a2418763941c679d31dde82940cfc2a480b0cee
 MISC metadata.xml 740 BLAKE2B 43e5727769b3fa3fee9fe4514993988877b08a3a21816031cd21ae497a66801d6ba4993236e656b7de4161d22837975bb6d8e9cf93ebfd416235dd622a0b8758 SHA512 697ae7be911f1ce3a8b0c0f9f8509ac5fd338463b7b692ca320ab41ed7676fcc3d7db59e759cfbe82c6d2a1fa9d85a1eeefeda3bca702f56832f336ee7fd0369
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
index 42732d6e3e70..0bc58fa9e5c9 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 301511caf367..68a3e0ad9a6e 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 9d7618c171a4..aa898be9bd02 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -4,4 +4,4 @@ DIST esptool-2.3.1.tar.gz 72312 BLAKE2B 4e44a2be2a72ab25e85af9b380f5f80896a84490
 EBUILD esptool-2.1.ebuild 743 BLAKE2B 7a25f559a58b7100f7153d0c44fef79d4c43de5d28369b6d273e3cb6a422813ffb25c41e2ec20f67d6d641f214c80ad5ea3c57a6b9cfe864accf082ce46dd9c2 SHA512 c02e79f351f591ea7f8f9b01c1d13aa92a6fd99c86c317bb2f4dcf9569b222085a4e51ad99a728ebbf313fa1a70dda4a2b498f9d2a8104b7a924d1a9267c821d
 EBUILD esptool-2.2.ebuild 734 BLAKE2B eebef873f847a95e2a3ca0847f73b4ad0634b669b1c72b57476b74f2678ba8df043b07019cea905622487b432881979df13a6c709463935d1eaf8c5108df55d3 SHA512 547cce87574fe5bb093d5847462d705e748a3fafb71398c781e97a6537dad30b8fc5885410119ff216a9dc21b30a3d895df9be0fa269fa232bb6624ef1daf86d
 EBUILD esptool-2.3.1.ebuild 744 BLAKE2B 8f929ebe72e21cae80efa8a0831bc97142866c749fdb301f7c6ec651f49557787d3e1cc7b4fd0bcac9a2ab637e9057ba5ec46d7e51b2fe8d9e4ea9f2eaa25647 SHA512 03936f871a0d94b7e0d2d7f0e083df2660d4495ce270d716f884b9a7ee83da848d3c8cc4448f8dced07bd4ce966885dd3edabccb3d1294397b574ce0ed637aa4
-MISC metadata.xml 249 BLAKE2B 01f2928e8ba93a41e65d8765b2e6690428bce44fa2da6f2b6c778d6f18e533dc1432f82aa57c185052b2961bf1aceb50f1fb33132f2a15a3c5aa75086ef9ba84 SHA512 28f5e3d6d9304664df20f7c0ecc01754408df1b1d483b28d21c23c101c6cc53769caef1ea214f304e9414cbea47aa522a361fa862d8a0834444ec8510261e968
+MISC metadata.xml 449 BLAKE2B 517225c4d9d06734745bf749ec6cf81f325146bab22eff7a0577fdf16d005d82f12dc3f426c71f902558c9725506a13e0b60fe1f7ec00818ec5e3a902a15e8c8 SHA512 67e5139fe841bd608087ee72ab5e25e688abe48892a8cf9e18ebcd61223ff16de03840510fe2e4eac852ad8e0c0da32df2edc797cb1b77a7a48639c2a3d16e10
diff --git a/dev-embedded/esptool/metadata.xml b/dev-embedded/esptool/metadata.xml
index 76d8c77da4b5..4f9e54266a0b 100644
--- a/dev-embedded/esptool/metadata.xml
+++ b/dev-embedded/esptool/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>m.j.everitt@iee.org</email>
+		<name>Michael Everitt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">espressif/esptool</remote-id>
 	</upstream>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 16c57433c8bc..144beb57bc4b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 1ef2b0071665..a1e9afe6f37b 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,3 +1,3 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
-EBUILD ivykis-0.42.2.ebuild 381 BLAKE2B a3535cfdc5b0ef486d5817e3f671ce81a59bd3b4d61c9efbc2ff6a199ecb23d1557e6cb456434d8df4e74b859a5a7526f2ce0b107b80bdb8b8d730d56e9aa6d3 SHA512 1652b74d0b10a6179f022889ca7ec1684b26df86897aed3aa3d1b3f6c795dec9d29da4c57e2b592718b3e52f9a0f66b2b8882df2ffb8a3e56f189f6bf07c7adc
+EBUILD ivykis-0.42.2.ebuild 386 BLAKE2B 49f128fa1472c134e839701ab281772d9b743d899eaff9b1a10bffa13ff8bbd18ae8c49c34d6eca975e665fccea32e122c766217a11f033eb2de4aa82b04de9c SHA512 e41256533e703c1569eca81150426b6bed415b006e664f3e87537c95167760a8dd35685a1b8547fa1890c1641777599b0e1b30aa3033c0f59602d48a5aab7191
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
index 2b310b4758f0..3530fb1257a4 100644
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 570c77a090eb..abca118743e5 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1371 BLAKE2B c4eb8408e0151f36d504c95a4acd758e94c5a281b6aeef2ff0dae2ff69dd9d40a75a1bf2285943ceff34e4cdbed03d149cdad5ad69c826e0e1895387faa3b70a SHA512 4c41a98e1e35c593e11232635f3780c473e99b90848dd14d79b00dcab6738aa0af673cec3065e68faccbb6ba9c1cbff939fcb567289b3982d5602ac3c411c3b1
+EBUILD jsoncpp-1.8.4.ebuild 1369 BLAKE2B 7da910bd64137755c85315743ea4066f3685093169dcc31e724af42658d6106113eb22f57f9c3f6f9f976d5c485db47cfd5e5f887ac01863269e967dcf774676 SHA512 4f31c63900a3fcf32e5a465ea5245258e76b4c470981599e9fb9f920772eb22168f411b14c37a93fea864b1c21f9620126a6c1100398bf4769b247049dbf581c
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index cdce6d23b442..9ad40f8d7dc4 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 4d69ce6328f7..9bf2a8f99e66 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -12,6 +12,6 @@ EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abb
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
-EBUILD libbson-1.8.2.ebuild 775 BLAKE2B 757fcbfa99d6faf368f1e8f75470ab94a7fc055d1bd13cd57e4005e8e27852a39ec5cf7adf6d426b0b15e18c4ddd2194ddf7d77768d2c01a855e20f32ed330bf SHA512 0823615caf208dd73db77cff1b45c819b04e597e3a046352c905fe52bb46095baba016362b31684b1d269d1907367e90642a97d6cc684f67fadecf0f5188615f
+EBUILD libbson-1.8.2.ebuild 774 BLAKE2B ab3fd5c073414eebd7d2a13112b3433ab9aa6910b4227c23c2ffdc903c38ec739795ad6c8ef3192b8d84a4b9df5da5454a262432f6f4cbef43b48cccf9c5b62e SHA512 27a985090071f8e8084681dc82d310d7a7259a32a3715aac00914e4ee934049e1369b90484b5bd70bd936273fd1ef1314ee568c41f29b188d4f4e7c917cfcd3d
 EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
 MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index afa64c6c9047..2a781b8d31cf 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index a86fb0c7ec18..3034d41ae438 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -2,5 +2,5 @@ AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a82
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
-EBUILD libdaemon-0.14-r3.ebuild 1402 BLAKE2B 823765ac95a9984d0dcf89009e96bdb3a268c0869f6dc29a1de2d5495ea7a1ed7c2cd9de5d64d57c1a6f158401356e08cd3ac491e7e603a4ee69e5927148a9c2 SHA512 2dd942161be0551fd38d0edacf59ccb142b700c1db0ba7e858a8ba733c31e112dbead9927591248fa533d6ce833900e30573898573a5a966369d13f15700c5e7
+EBUILD libdaemon-0.14-r3.ebuild 1401 BLAKE2B 57603ac8bea3e1ab88607e00cfc40b1e05b453d6c3a6f6daaa80fbcf82c49ec2b8cd87a5af9e36b119f4f02f914bf9b529eb3d790edef7dc98390c30e9bf96d0 SHA512 c2113f7bb113a3a12b73e1973ba85b499da6c6803b67956895cbe6aec7c54ab77c5abdf5b9ad9541b7d84418a18df256ebab538547db97917af50c1ebb871957
 MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 4517293ee693..8d64d71e16d4 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
new file mode 100644
index 000000000000..8bf405f1fc2e
--- /dev/null
+++ b/dev-libs/libgpiod/Manifest
@@ -0,0 +1,3 @@
+DIST libgpiod-1.0.tar.gz 411974 BLAKE2B e6c962329f7fad374d2771e60aa87e679970e3b593dda73d51f0511b14122d8a9d94eee3355ede2221d4ff0cd10f7116874c535fe90092fd61ccc5aa8f7e9818 SHA512 e8a71a7028fa73a94d8507d4329bee024c3e73d1b619dd5500172bf36509c7ccee521ddb6ef07283e3a4217af9da12ce154af657f8a536883f5495ffccf46e0c
+EBUILD libgpiod-1.0.ebuild 719 BLAKE2B 59a470e86ce2a0ae78030520ef902077d063d1571e5844b7290806e0f1088524d2f80c129ff8b79413d32db1962d595b2ab35ee74a222ae33ce4663c909196e4 SHA512 6b12f160c828d8251715a50c141a316019abec0d954b5a78313249ce2550fcb8466ca85587acc282be64869737fe2ea8033cbdc9682b5bebe0a733023d087222
+MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.0.ebuild b/dev-libs/libgpiod/libgpiod-1.0.ebuild
new file mode 100644
index 000000000000..c83a38aa5e72
--- /dev/null
+++ b/dev-libs/libgpiod/libgpiod-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib multilib-minimal
+
+DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
+SRC_URI="https://dev.gentoo.org/~blueness/libgpiod/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+# Reflects the ABI of libgpiod.so
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs +tools"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable tools)
+}
+
+multilib_src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpiod/metadata.xml b/dev-libs/libgpiod/metadata.xml
new file mode 100644
index 000000000000..e9d3e660684a
--- /dev/null
+++ b/dev-libs/libgpiod/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>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build some useful gpio tools that use libgpiod.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index dc48b8c5b9f6..d46c7114b0b5 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -3,5 +3,5 @@ DIST liblinear-211.tar.gz 506507 BLAKE2B 31b7677dfbf9dbb060a28dc19c63db4244e55c4
 DIST liblinear-220.tar.gz 517302 BLAKE2B 6aa28c3357f830441ee3cb2e9691d4952e4d4db6592622f6e93be1ed12c8f871e4a9c98abcb35b472a227005bad0cc1e6076678358dc324a7453cbbfb34a0866 SHA512 cde798b7cb221513cf2b8bbe134d6c3dce1ed26c43504d8c09dbed93b82ca47bfd271d4dd3d03384187273906ce140d4ce4418a4a8c21410015ec1631c1042c6
 EBUILD liblinear-210-r1.ebuild 1415 BLAKE2B cb472c95901473cd8f1307b781c501383be43ca8796f158b5b9192e5450ac40705c7a4eb0e0383c13ffcdcf38ff8237a6cf1829d1ed8a2396014653a568b90b9 SHA512 6928d45c94eb3c63bb0d29ffadb4738240e6b24ca71d88e121a8091ccb92fcecb9a6df9c4d27e5c381ad8a9ea2fe3528793fd7a950ae90d8b6daaab95b8c777d
 EBUILD liblinear-211.ebuild 1433 BLAKE2B c809f415ff402c093fca9376b57990df962c67281da12dcb4bd6dd2e4740fc2d805204318e20b4f10c7be292c10a87c55c52bb9404c8abcd0ad4eecf599afd84 SHA512 650c1cd319cc802c3fe3cc2dd7a1d95b5527c49ba5215f58923c39bf77ca74d61b710ecc2aee6bb091315c7b7b51297141d0f167eabdbb022c9f2596bd43ac24
-EBUILD liblinear-220.ebuild 1433 BLAKE2B c809f415ff402c093fca9376b57990df962c67281da12dcb4bd6dd2e4740fc2d805204318e20b4f10c7be292c10a87c55c52bb9404c8abcd0ad4eecf599afd84 SHA512 650c1cd319cc802c3fe3cc2dd7a1d95b5527c49ba5215f58923c39bf77ca74d61b710ecc2aee6bb091315c7b7b51297141d0f167eabdbb022c9f2596bd43ac24
+EBUILD liblinear-220.ebuild 1444 BLAKE2B ec77b7c029d529bcc4948d61fa9f92c9d8fe0469c702068cc90595fb5eb54e9d13f72c2966d26b2fe62d8954acefd11cefb3416545d3abf7a57d9c70ad34dc2b SHA512 02df3d95f6ce2f3d406b7ce476c0c033d85e17bf3a98e35c8d0f13f7d479404672f1e8f5679a861aee5b018c5a5f4b1e425f2d3ec63d62b631574e52343b3de3
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-220.ebuild b/dev-libs/liblinear/liblinear-220.ebuild
index aa78ae616b61..3080e1452cc5 100644
--- a/dev-libs/liblinear/liblinear-220.ebuild
+++ b/dev-libs/liblinear/liblinear-220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
 IUSE="blas"
 
 RDEPEND="
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index dfb35e50868f..e9775a8b4b5c 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -8,8 +8,6 @@ DIST libressl-2.6.1.tar.gz 3219005 BLAKE2B ca5c1b2f1c824f9faf26cf335a533b98a9af4
 DIST libressl-2.6.2.tar.gz 3229140 BLAKE2B 65ee69ac9d5754a153ed8e9ca20240cf6d584093731a0fc53fc847f6c2a6516fa709f347ef58059a3dfde7a6013cef0188d6632a15ace172f6a371f1fcdb7756 SHA512 2896d52185b84edfb23eae73949f5a537966b42e659f00b0b2e0635e69daf546fc41e0e7b97cb52a85e73b2d27ead221a3225977f6b5ee998aefdabf0908a9e4
 DIST libressl-2.6.3.tar.gz 3228661 BLAKE2B 01d1e09a5c4541e1d6b35d0a1cd9246671a7cda404c9818885cce55897dd405585a656b748ca6c959224b7d6155c20700fb4a92c37af42429959162a7ad8fb87 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
-DIST libressl-2.7.0.tar.gz 3286436 BLAKE2B 883f24f70dc39c0547d63b852274ce12e03910d5b8eced70dbcffb062d236ad03b3e7dc0c265277f33666616f682b454130be18fb2f8112d42aabcaab8882a69 SHA512 d0e51fa7143f71266e9193fbda151c6e65ba403fa93b4030edcfd4909f5905b03586cc5605e58a62a190d46e9caf7191b6572106b8e92bc5400b2e1b6b7e025e
-DIST libressl-2.7.1.tar.gz 3362461 BLAKE2B 48b62160298ea7628c6671271b7ae9249cc3355cf6e504b504f7fef4ce62337f07e0a8117eef88fee7ae2a0517859f83e8540003dfd2c577f10841088d9eb180 SHA512 b7adc4250ba3fa5a3db20890aacb6b40dc9fbc29cc470c55dc9742430b9ba10ec122e6edf6f1671d77dea6347be1a23dc3d81b3b70f9b6e722212f356c36dfbc
 DIST libressl-2.7.2.tar.gz 3364227 BLAKE2B 49da6903a63425ac246c574b4c842706eaff184ba4a1768f61b2007296cb915f944f80f79edbad12b1a28a5552282522aa2b037195e2f917c06cf6917f1642e6 SHA512 12d00d057d449eb4119fc2f07034ebc0f1bbcb1602c0e07ef03b50440045eafd70594ddee352946cd9409aed8aceeb6988ba1643f582566fe3498499d94ece49
 EBUILD libressl-2.3.10.ebuild 1288 BLAKE2B 2fb26bb56c7a74b209df032d421e1ee8f47a3817878b145bbb3bf9c11a1630bed51d9203b4af28af83a2d59a92d0997cfdddb9de065537198b9e555b81a21ad5 SHA512 11102214e13ba952be7d85b3dc46b98e2330ad4139f9205bb5992e955092d647865bd2a3c31e3d9ac60404d5ed19aade4e322169c896cade2d5ae0164f9d52c2
 EBUILD libressl-2.4.5.ebuild 1288 BLAKE2B b0b15886c79d4711057dce71dd0bd087740a07799c9ecc529ff46572cbf4471cfd555ef3b95d9266a4c087bfc5f1b992e6112914500f7e4f04b0e67b2c66ce3c SHA512 52803ee1f7f98e2dbb84eccd2cdf69336572d90becee991f3b8866661c9473c01a102ea286396f9909f0ca69b4551356d3d64188f9a8b0c1c3fe2f2aa8b4f865
@@ -21,7 +19,5 @@ EBUILD libressl-2.6.1.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87
 EBUILD libressl-2.6.2.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.3-r2.ebuild 1315 BLAKE2B 27557c431220c36ead74810a6bec36f8c50e45efff1f76a57c26b0546d6a2a309a91e68e4156415f3bed7f2c1080a8c90764d00a3e5d1f91cbbd7a7f5574cad9 SHA512 817ac8f8a17a757cbada0e6978a880fd8ea1d84fae02c43b7ef0c48ea5a57c88fbb71e540bf4ac93d7fdf0698b0b8464fd482a6c9add2621215bafce8ecc46e2
 EBUILD libressl-2.6.4.ebuild 1313 BLAKE2B 6e9c7908dc7d757ce44897c72dac0b9ea92503d650c6df46eda5dbf65efd9e89a92ab52203c91a3e40c9f1f23c1a99851ef2fd54ffeba81fa80872f0cd2a2445 SHA512 587f95f4fe9824fe09a2654f5a0d16a2bc9de9fc4d40e3e263259067f6dd3bbe8d1a4ef89cf90952a602acbfe2171dc16bee030350956d87864437905fafd6ac
-EBUILD libressl-2.7.0.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
-EBUILD libressl-2.7.1.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 EBUILD libressl-2.7.2.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.0.ebuild b/dev-libs/libressl/libressl-2.7.0.ebuild
deleted file mode 100644
index af207c40014f..000000000000
--- a/dev-libs/libressl/libressl-2.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/45"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS=""
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.7.1.ebuild b/dev-libs/libressl/libressl-2.7.1.ebuild
deleted file mode 100644
index af207c40014f..000000000000
--- a/dev-libs/libressl/libressl-2.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/45"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS=""
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index d2c317632687..c3f9859ef6b0 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
-AUX libusb-0.1-ansi.patch 4461 BLAKE2B 025a91854a30dbee880eb27cc23756bc42af773ca25a82f5255d2917ca9948642410b14d11ef4f65ba52bd1c26e71b6ca14bc5327b7e941a1793f76deeee9032 SHA512 0256487ce4916e74154b18c9f57d88dc31344d0d047e70e7a0231c066747779e1455a422483f4d4ba182b57bd2be5038c9f091a8e0cef326128fee51efc04eb1
+AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1271 BLAKE2B ce9a6378324f2de24587c130ba87475551c207ef0e462cd74ff4cf93670a02e9dc78bff4681e2fc05bcbdd00a796600fbb0569296d32455b522bcb02b39b80a9 SHA512 6d0ab2dcc8a5b06f8bb78e83b7f46be1edd56b20acfdc19919686587c311e9cc65e7efa084407d1e38db0510fa8d43a5f1e1246cddc44ec134629612cf541e75
-EBUILD libusb-compat-0.1.5-r3.ebuild 1334 BLAKE2B cefc444f98e4ae5e1c51af4ee18f96f4db5fa9d93ed819b05a5a055b472b9d8675df8c6477c97076b6ca103990bae41100ddeb072dadc7611a9aa740afcdf8b4 SHA512 b008b9cc74a1a70cd34ba2ef93a2f50b0c27161f84c4c655d94e6c26991bf6e3a1ef051e8a6619b71982367f4b22a9f7ca7af887460ae5412cb1a3360ea16b99
+EBUILD libusb-compat-0.1.5-r2.ebuild 1143 BLAKE2B 3dbf21d533128c603b5dd5963e0201b62c7507d59c38687d16b3c14c93b309f8fdb28dd5feb392fb7a1fd6cc5cc000cf43d4ca595ccd2b16a6e002899a1e8186 SHA512 f5bd9084c0f64ac9852506a98ba38b612b8697743b031980edaeef7c2deac8f997ba3dd6f22ed372ac73b8488b1fa17eb6c6918e98ce3fcb5f53b4c41f498659
+EBUILD libusb-compat-0.1.5-r3.ebuild 1206 BLAKE2B 686518c59e3a51105e166e59f6d688f5fd8598fc5a1aa5cde02507c29f362b8a9aa32d190d2ef8f4e12dc7d25b06069e32a5b370d02072f175cfacfea205d60d SHA512 7307eedecc091e0fc2fdc721d853d79534d88c236ea9c47abaf5de4c2c4464a3aa7031458ca9f38327e5bab3228cdb301602387c4cb57a4369752478ffd8ba4f
 MISC metadata.xml 552 BLAKE2B b177713b8523c97bb9cbe9044b69207060489656f4369ebfd44051530f45eaac3500df7c3ba085a015ae8de96cc95777fa9ad1b900cdb3b1fc87395cd865feca SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
index ba3436f6d7b4..c04f7172f3ed 100644
--- a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
+++ b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
@@ -1,5 +1,3 @@
-diff --git a/libusb/usb.h b/libusb/usb.h
-index b7af749..c9726ed 100644
 --- a/libusb/usb.h
 +++ b/libusb/usb.h
 @@ -27,8 +27,10 @@
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index cdb691d5acf2..a6572e20ab75 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
@@ -42,7 +39,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 0fb988759d93..4e620b5b8fb4 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libusb-config
@@ -46,7 +43,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 0607c3b824ef..d4e3d80444c9 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
-EBUILD libusb-1.0.19-r1.ebuild 1640 BLAKE2B b772c5fc3e9b8c7dfb4923da67d1eea3f8c8358f0784643f42ddb2414423daa9f922b650d06c4fa9e6457018e77f450376a81cae98e9ce1c22375317602194b6 SHA512 141aee9763ccc76e11ce4d074cece02369c7f65fda639a3c754e548b9ff1bd7ac00f3244cc1a04d8f2a5ca4507a5a8192eb11e8f30908ca239700012c982239a
-EBUILD libusb-1.0.20.ebuild 1733 BLAKE2B a0281c5ce42922e235c7ad7b78bf76d62dd5441fff8e7cd7b98f334c5e0906de32c284067d5bbcfd92b7b1c3a82041bcf411bf9ec53159516fa74933025dbfbe SHA512 5f926dcca1eb2e7bc614626fe1a751a2632e88abcf4b9152781e23ffb77a4d1a72971ea5a0bd5f4e7679d348eba294db30d18c55298860a9d09555e0126d0eea
-EBUILD libusb-1.0.21.ebuild 1577 BLAKE2B 4e51f54f8c8b10b0a21ea9f5ea3111c2df9e14a32ca387ce96a3f3b5e26da63baf8ffd26d69deee04b55c50cc351024e719d3fc52d0b3a54c3301272ca21ac1d SHA512 0e42d007ce9ad04d9de74737eb9ff417ea9725cdedcbc0a5410722bf648ea3255f8e08cf0b8d4126d5bb48d3f543e082574fb551402d62255813c1cd4fd5a8ec
+EBUILD libusb-1.0.19-r1.ebuild 1525 BLAKE2B 396f17ba82cc048c5d932c359d13f2567edea36b7b179d2b298c166b6e676470f00e1fa792fd087b60cb33f809ceadaa7ae19363147978b3f8619959b2ef656e SHA512 83c518f8cfeb5ad805d339f7327f5f45fae16d14b13e5d5815a453f0d9579cf5337b050da0aa598cd3c9917a3e486416154b8a8c53aee91a9369a7b199a00ff7
+EBUILD libusb-1.0.20.ebuild 1618 BLAKE2B 20ce9de797636977a9c063bfe00aef8c875e506be46a5f56d77d594a1877fe8ef13dc915289840ad015c75456261e2ee17977829259b46ebe8dbb8aa9703e95e SHA512 dbcf005dfd2090bbc49e1b8993a373f88978c9c924dc9cb4fa1508fda82863794889ad815c92105a163648ddba57578751804b8a82ca7755faaea9920fd3ef09
+EBUILD libusb-1.0.21.ebuild 1592 BLAKE2B 6caedd7599d9a0ba58074ae1e1fab39e4a5956e3e8ecd702ac9791ec02fa95e485fcd65b3fa1e37c368a9cabfece2bebfb303186058c795c2b1bebb2e0d6158f SHA512 6923651eca2d43482eecc331d662870b9d107671d18f2e492d3740797fee21d05010ac1db9f0153dc8aa61c3803021b8c1373edf57ab0a5b970772b4fdad530c
 EBUILD libusb-1.0.22.ebuild 1586 BLAKE2B 977c9b824b037a5f667547ed24e0a3628f30c1023f69e01e371f7afe24876c8a404d903544da6d0053f00974f9bbb8c5205e29e8ea68762315bbd66cce1a0f1b SHA512 43174dbbfc73f2db901de5670d8abb67dcf431b205cff0b03fedadd463d017411a332b5610944964a2cbd905867b0d7dcdbe35503885c400b4402fcb9e8fe359
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index e6a4ae67ceec..fbff28cd33df 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/"
@@ -13,11 +14,7 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
@@ -57,7 +54,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
index 5ac36c1e04ba..4cb30544b999 100644
--- a/dev-libs/libusb/libusb-1.0.20.ebuild
+++ b/dev-libs/libusb/libusb-1.0.20.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/ https://github.com/libusb/libusb"
@@ -13,11 +14,7 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
@@ -58,7 +55,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21.ebuild
index 18cbced9c97c..d7128f492b8c 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/ https://github.com/libusb/libusb"
@@ -53,7 +54,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index c57c8a2d0490..93bac43951c4 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,5 +1,5 @@
 DIST lzo-2.09.tar.gz 594855 BLAKE2B e2a3f3582ce8290f4c66e80e5703af7074a4f097f8b8dd953d8ebcfeea42bad13bbc724c268ef09f5344ff9857ed60cb5092085b225a1b33f0d1252369516cd4 SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.09.ebuild 1264 BLAKE2B 7c75a964bdebeea828ece72bfe7c57f45eb12f53f8df7334dfcd977c96b6b56cc10849667fcc1483e9955e4e7fd61cc0c44a29e5ef3a2ac60b3eb501a7414660 SHA512 09ef14f13313574994a9c2386eb3cbead83f9ac807394a0138dac0c507b7f1dafa00a97f0997351b52d4d84507b7022d697de03c96b0e5ff3ae98950e03ff29d
-EBUILD lzo-2.10.ebuild 1048 BLAKE2B 9afa3325e09fcd29817af2ba68231ed5f53330c2be314a993e8610cc7e61d24afda69ffe59a402aa88dab7b8ed7d068afb49efb42d34a7c863cd7dcc3db4044a SHA512 76a1c74dc5dd42db124a6701315fd9a0916b293003429aa4c7059f226b482a50bb558a17db6f976406bdb951e5e93080344be7c108ea49bb5414495f42077be0
+EBUILD lzo-2.10.ebuild 1044 BLAKE2B 02531619cbb883c2b3d4a552e52a064aaefc67ebb79f74bcf0e47e82f255e0a05cc9eef4d6904a559db88287ef2a7fb9f19cf1289ab383d464db8c1acded0ea8 SHA512 ee83f8a6261a49d071b280470ed5a91e75914b71ff48824b20b2a0bdd48aadf93c2bd551783497832939be7543fda17e277a56d94edaf9a5afa3c24cc6cbba99
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 7a1999d9443f..e7f8186b70bc 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index b2bffb27bee6..2763af21a13b 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -15,6 +15,6 @@ EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
-EBUILD mongo-c-driver-1.8.2.ebuild 2151 BLAKE2B cbb1bb297830b3cfd66c082be4fd04732b26fe7e23d0edb4a63b69556d326f6d8be143f5ae6e684fa8111ee45ed77be215f830802126ff508b8e216332ee5bbb SHA512 426c0848aad3a0c2ca11cf308a72789ad9cd4e7a3e9ffed267a0ce3fcdb34f51054957eda4d8b9280900cab2ae8bb3da6405e92fc527eb8cf1c9d74f5a8b9aaf
+EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
 EBUILD mongo-c-driver-1.9.3.ebuild 2153 BLAKE2B d6abb8f98f741dc893ad46c50b8ff92f7f151b83ac402bb07c5a3335f648c04eafa26e85f4f9dceaa3bd2a89e96df4d673f755135fd1e31cd03a203ba4643193 SHA512 75657ac140fc3aeac90342be78a18e999f62813a5ac0dd6de782c1ab603e7b602c2d6351650563d95113d9d936413178650bcdeac66d6774255708a6e4d025d7
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 1ea4eb35a6d1..d034808158e7 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 4f7e5855968f..751121a7b7d6 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -11,5 +11,5 @@ AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 253
 AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
 EBUILD ossp-uuid-1.6.2-r4.ebuild 2780 BLAKE2B 8d9477201e7115689ce78730fb57a71a26809b8f8ae42081cc7bd6a04445c6f7f007d3a3659034db79b4cfa215e65d9899deaf368366cdb80608589265934962 SHA512 2f36c1de9803540f124372dfbc5ba82cb8e31a7b168cda04a43c95b24c265ec4386794b00d44d6d24d9f1a98876bbceae94c459daf3cee559b1670b78d718721
-EBUILD ossp-uuid-1.6.2-r6.ebuild 3035 BLAKE2B 833e8ebacca2ed01e5da0c8e5ab3a14d712b8b5d23df6d9f25999a9117bf41ad38884d757c339a91b41a0f5640ba72ef8c709bab78f39e1c1b0ae2d5b9fa6d97 SHA512 016fb7fe17d4073f7b8363a5fdd644309336c09822404be1108d07642f94bc639f8cba29d66609e84f8b2fec0d83272da763cdfaa1a37ef9defb96c8a0f98356
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3046 BLAKE2B bf9673f52ac3d58bf47b771634fea820c442a1a71a4a8df2ad9c388249b1b2b3e49ef1da018e3d7c89196cf91a76dc96f448ecfcb547f6f676c9ce57be42ea31 SHA512 bb046bc2d048892e8fa8acbcd0941f548aac5300829d338be94233db5b70fd96b0ed7910edbae181b20d95f6837b941d13bdc389ac65319213c18bdc15b351fa
 MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index 67d3db311450..f0bc8e587ac4 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index d85dd961e9e7..5e8a5f736624 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
-EBUILD ptexenc-1.3.5_p20170524.ebuild 1317 BLAKE2B ae1f43ca61627a05d17e812c47b6f2b74cbce0f63c5e6e364be8a76ec9fb641c0f5ec9140fee57612069b0c32ecaa6fd418e267c8b39e04f8e93b9fdf926a69b SHA512 64991d55a53965e5c39b30a06740857e8734f82d110ee267979954ab359cfbc9f28b6b929d1307dc0ed9457d9a34eb37c6363dac47579ab44603be7d2aa9796d
+EBUILD ptexenc-1.3.5_p20170524.ebuild 1328 BLAKE2B 799fa7d97579d54c2c141b078e2684651357fdea5d2409a95f81037af3a15a525b9c24b5fb9ff88b2565210f86ee27a1e2d44af77e74a60c9229fd3d4720c4fd SHA512 42b23afb1ee91c90d619a9ed310d5c67c71e0635d1300c85c8830166be0ca1c6f0492fe9d7dcaf9c13b58987063448da7b0cd878ec37e789ce99d4aeb8033593
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
index bc01b4e78eb5..502e4b76cbb2 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index da440575d551..d16017c652b5 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -3,5 +3,5 @@ DIST qcustomplot-sharedlib-2.0.0.tar.gz 1949 BLAKE2B 6d2d1b7da0dbdb83485ce1a1b69
 DIST qcustomplot-source-1.3.2.tar.gz 225912 BLAKE2B 9bdcb9ace79c0bc657838d6c0fc5660a61a0ba64893192f263c0e30473c176322b3f9da87341a762032ef1879a46dd89dd7e42ba0127dd22c969d72b0269d9c0 SHA512 0e9fefd3f6e4428009428d3155b1a26e1d4b2a62567ca7812cefa67c06fa53f301229d8bd2c3abbe0fb7ddacb9a07515522ded56c0745cd31b1f85323d4499fb
 DIST qcustomplot-source-2.0.0.tar.gz 317398 BLAKE2B c2d587e06026789a164f16ffdd00d324172654b6953ace637815b022dc14cc96362cf4022512ec3feea3725a651c1af0f50f09d0ca1c5e86ebcfbe3f50aa3ff2 SHA512 66c648877ed0a14cf527ac8526788065f494119cc61993d20268a0046c8e6c5a1c73a61f50a73e6a39ec55435bc5f74c613ee21254293ddab34ba7c2484c4f5a
 EBUILD qcustomplot-1.3.2.ebuild 973 BLAKE2B ecfe3daee292b7b0c279c733893c3a9de54ed672995bdbd51d960a045d2884a461e077c6881ceda560fa55f6d535d618248e0d500e202ce34f109417fe62128f SHA512 abee37f917b66122131a95078d56074674e11d87e4177bfc4e1623ed8dbe259397833c8578eb98952e8a30dc906be4f2ac80ec0303eca196a8044fbc5eb997bb
-EBUILD qcustomplot-2.0.0.ebuild 975 BLAKE2B 423093fb0eb12b4005836172126792017671789ddf432972ee3d40ea45d7cd3148f4dbbf0ee7e608a1604fba1ae1c50127b07c96a8f191d1bd2990736be582d5 SHA512 342b2a10359a06361d7c312f0095f6767c8a2b85e84adba909200348c660365e94cbe2064e9b157ff935c17c0845035fec31a292b371394ff2559f04f590d42d
+EBUILD qcustomplot-2.0.0.ebuild 974 BLAKE2B 0e2ac3dfb1bcbce0badfd87e10af8ab69647ab3a42c06d503c45a70c1d061c1eed2ca5b712933f4b6c864a7328df178fe708e7fab7db83560084ec6fc5141687 SHA512 4c4409994a5a44fb137dcc5f265e308ab2c1367a524a133fee74b308394d1b7b41495b2e0f038da08c484a3bfbf036c5bbc1ce0688069b2627024071020a0cd2
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
index fdd27dd99daf..4a331d4ce700 100644
--- a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
index 00922a3a8904..83c4f0d0f47d 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Use Moose or Mouse modules (DEPRECATED)"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="test"
 PERL_RM_FILES=(
 	"t/001-basic-mouse.t"
diff --git a/dev-perl/Any-Moose/Manifest b/dev-perl/Any-Moose/Manifest
index 086adfd9a034..b1e2ece3bc23 100644
--- a/dev-perl/Any-Moose/Manifest
+++ b/dev-perl/Any-Moose/Manifest
@@ -2,5 +2,5 @@ AUX nomouse.patch 360 BLAKE2B 74e307d6d3f7be09b054823f08abf801ad27f7b68e2d98d13e
 DIST Any-Moose-0.26.tar.gz 30456 BLAKE2B 32212f999f4461a5264bca7db617c658bb6c58b9e208a877c6631be5dfc223aefd2dd4def9bc9cba469035d20354ca41ac682f50ac6ee7548328df314244f1e7 SHA512 2883a216a76e5c58acea3679e1e20ab5f4646acc62644c40db3688c554730af6836628a0df259efba0a3f3fec6abf9575f53deb70f2acf0d253ba123248e9384
 DIST Any-Moose-0.27.tar.gz 32856 BLAKE2B 0b11bdb2cb75d880c3f11778b0f6a6ee1a56043549fb356c5adbb9bca2e379f1aa3169642bea2f9daffd97b9c976b07f4662c5c652a6f4d63833cd2f02613baf SHA512 5c97caf2e64462bae95fc4d5dd41868c01f856bd8f74872985254b7cc6ce0e13b4accad7955047ff5c4013399f7aea2ad6d48ae3592883a3b6cd20c0e4478b7b
 EBUILD Any-Moose-0.260.0-r1.ebuild 684 BLAKE2B 68db533e76ba74cbe481303e40becd616f074e22848379af5531ffcd1c3d3f60642bc100107c5424e7fec4a9c9db32c554db94250a0903ac70f4d0f7cf14423e SHA512 265946ade78638febcb2064314795ee51565fb09ad587d71ed54dc5109f3201d46b59ddc0c597a5faeef150b03c8ffca21ceadc60c9a0b116d7b8e12346e64da
-EBUILD Any-Moose-0.270.0.ebuild 646 BLAKE2B 23882ce233456107190f9973e24a6fb8a8aa73486bc656af16fcc780c917fb929c013fae0205fb3711d4afd02cd0000d3f896994174c1a13cf21431370cbec87 SHA512 3ac9f9a0019476905a6b0b0445bee2ddedf59c7c7a92736f122541bc38c53ededf38aeb5837aeff272b6fbc0c063e9690cb0e3ae06d4d8fe27bd903f9f634aba
+EBUILD Any-Moose-0.270.0.ebuild 645 BLAKE2B 1dc69e55923a3b8628e3a98cfba6cadb3f0bcedc45088c6910a8592757c2fdc2d40112387f6a2b3fc52c482c51960c81f01eff1c7477c9cf897942186c9317ae SHA512 c64cd4cde917f99041e9f68f468f2531e841166e77d13d2cd9c39bf41b4d99a4e7c336d77783a3207cc35af34509bc292b64e1781f462aa2e23ef250dfb1b7cf
 MISC metadata.xml 390 BLAKE2B cb432d71e82e4cc88d553baa331db49ecc3d2b98f0e44a0befaef59d0420910b77d19462900ed3c2845ac936cdb28e70dd0b97e3e7fb37414167d8e62285f321 SHA512 76a800d7c4af41e0681ac8395650d6302e18fd3e4f787f2fbbe0b132aee5ea5302a2557af60d835cc69b048aeb5643ec8660d72bdee4e4e1cbce72beea19ea07
diff --git a/dev-perl/AnyEvent/AnyEvent-7.140.0.ebuild b/dev-perl/AnyEvent/AnyEvent-7.140.0.ebuild
index b70a2477a0e9..d57b2ba120e4 100644
--- a/dev-perl/AnyEvent/AnyEvent-7.140.0.ebuild
+++ b/dev-perl/AnyEvent/AnyEvent-7.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module eutils
 DESCRIPTION="Provides a uniform interface to various event loops"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/AnyEvent/Manifest b/dev-perl/AnyEvent/Manifest
index a4db765e5259..27d62be9710b 100644
--- a/dev-perl/AnyEvent/Manifest
+++ b/dev-perl/AnyEvent/Manifest
@@ -4,5 +4,5 @@ DIST AnyEvent-7.13.tar.gz 299596 BLAKE2B 2aadfe5aeae8297c91751d59d86b63c0228a3b3
 DIST AnyEvent-7.14.tar.gz 301645 BLAKE2B 5095506e02ae90953d3990609ad77c45d602bd38a696ea054d329ee4e9fb526ac799ba45eb38f274835248d7e593257e7203daf1a7f17d5086f89413b93ddecf SHA512 98e7b9e06cf74b99d3407a25b60f3b825fceed3bae43505e1fb90785e24bd88ae25955cff25d29b4cc96957db7f4f5203d19ad2365abb4e3a3227fd91a16fb25
 EBUILD AnyEvent-7.120.0.ebuild 469 BLAKE2B eaea9dddc02512933f4574488cb489aff4f7c5e9421ccafbc881eda7cd8585976559b72aa2326cff46a1a73ab80fbf08fb1b69a71e5ba32da2a9e8790e49a615 SHA512 21bf3e3767ef5bc845ee8f188f7e897063a8d1a48c1592917b731650ca536b0a8748933730dc69f245cf7f44f512caca4e1333fd29d58c043f60212a491be2cf
 EBUILD AnyEvent-7.130.0.ebuild 477 BLAKE2B 04cc795f45fb3df1ebc909ade9104636ac8b9a766a6b9449a5ed56ab3e787f9ed160b98126c6a6fb45046e504d882eac53548c37c75dce789c9cb9f753b5c5a2 SHA512 7398b50a745cdc0015c40bcefd51dfde8e584884a72bab6fd71ffdfd38a68bbcf847f687a9f47c7c0cfbe61637e7060ee9d5cf177d5a375ea07173010bcfbec4
-EBUILD AnyEvent-7.140.0.ebuild 836 BLAKE2B c67d76da805a01ddb66fdfd7997ebf0fbdfcf162b81ce64563fb53de10ccae048bed92daf267e74261d9dee5592fe18796dd2ad9241754fb5e220b8d8f2a1615 SHA512 dac6b93105843fcdc306e90f0cca27f98fee99b126f0192781843054cc49db1e8ac35a4e6ce5923fdd9e5cf1b9518fbcd3b1c8c06a0fa16342b1ae7cccec5224
+EBUILD AnyEvent-7.140.0.ebuild 833 BLAKE2B 3be4aac9cb71d1ad5f148b170b04af4fc876456bb6a980b9eb581e384f631e273cc0ad91b96019f77bbe1c0d2476189888391280fded41214b4bc5ab6ca2b50f SHA512 6a239302e437560468ac22eb69a614cf7b28d52f4e1395d8efe651d02014a5dde93f06a95a6b52e5f77fc5e417587334f307eea23431451371c8def6e1961fc2
 MISC metadata.xml 3103 BLAKE2B b263383e6b69f575d8149b5aa3458d1273f522f73b1e9583d64022a6bd17056b34bd13abca0d43e204ee6a691b04189fd7e9dde2f55efffd2d8c836b34728b99 SHA512 a8eeaebbcc27c7a78d0acdd08f43d7ca6ad9589211b56927d0b7906f13e701c892dceab1c04b7ee11a70f9c81aa4f2521bdd4d54eb59b8190ba75f46eb9cdd10
diff --git a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild
index be754f09c353..371188716df1 100644
--- a/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild
+++ b/dev-perl/Apache-AuthCookie/Apache-AuthCookie-3.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl Authentication and Authorization via cookies"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Apache-AuthCookie/Manifest b/dev-perl/Apache-AuthCookie/Manifest
index 9a561073bbe7..c1417f22a3cf 100644
--- a/dev-perl/Apache-AuthCookie/Manifest
+++ b/dev-perl/Apache-AuthCookie/Manifest
@@ -7,5 +7,5 @@ EBUILD Apache-AuthCookie-3.230.0.ebuild 551 BLAKE2B 17a6b4d437f4c7f0b679fab6880c
 EBUILD Apache-AuthCookie-3.240.0.ebuild 525 BLAKE2B d8be07c7de6adffc97f29cfbe2ceaff9ba801ff1a5d01883b71844e79125f4628bb693f46f7ca75131fc2c2a767153c3deda7b96bd6d031a53f19fb0f045ff4e SHA512 8253ec00ca8515d9d1340187111e6f0e39d2681589a0330c4bdd016a0795bd8eb96f6a52372392e3737ecab06c539aa482c7399e690a8546733bb2a7284b71bb
 EBUILD Apache-AuthCookie-3.250.0.ebuild 534 BLAKE2B 3b20824975b96a252142561bd8cbec8b91440f8630e911dd1f6b87710e677ded4bcb5f1e08779702abcb061e545adec428afb313f524b23151365aa73dfa85da SHA512 273666d2d9996e3313b6d81449c871d9bce24be9a27c2515664a394c24aa25e305ff5c4e69fe66f5e0e6eeb2eac9b4d669fac2dadddcd258addb90a12f0a2cf3
 EBUILD Apache-AuthCookie-3.260.0.ebuild 698 BLAKE2B 8d1e86e77ecd12973a5a32265845675bd6e425f14e985c4a746348bac6b62ab8e4edd393d3d699e2bbdcd53c74b61d6c017942bbefb235238f5d408edfc89524 SHA512 a897cbc476e9b584ebee374f4eecd7ad8f971140eb1e2bf02b0358faf62cf24ec488b04fc528fb82ac18ad6293d3343b0127c5c2754f7949809f827fc25c8dbb
-EBUILD Apache-AuthCookie-3.270.0-r1.ebuild 727 BLAKE2B 36a896db629cf8ecd8c1d0afe00382be437c2d6674692612ed4523f0aaaa730d467631198ec4a83a4d698c904b24f95968000ca68a23d6537ea8ec2cd61b948f SHA512 c35b902e2bd2a98468e89c944baddfa0658d75276633524e34ab365c64f3ca36714cb6b2e5e3fee598af2821890e36d6c05e5b30bcc6728a914b0f3b3ee16d64
+EBUILD Apache-AuthCookie-3.270.0-r1.ebuild 726 BLAKE2B 4f555ad09d9d90f18bcc301013955b6d257d3bc45879ac87caaef169dcc91e124111b2d66e8e96cbcff439e7c769678562761627fac24e61447ff484ddf1b424 SHA512 2fb740c595d4579bbcaece9523384928a90836b8ba0c039c7406e5a8df6b40e6243b91bf660a2cbb9e3cdac54118a450d58792ff1aad76c000eabc1471e1c740
 MISC metadata.xml 1358 BLAKE2B 382c20f86cb25c97fe95d596813957e31ef7da1df4fd08ff8608678f9ff1f130664c85ad894d22373c3df18cb32cb2bec5ddf8c7ab1fa0f34a3bf7b24962eb42 SHA512 0c65d910ec6a25d9ad669ced9a772c723552bf194d31875ad9cfc1b8994af59b32dbc5d4227ce08052b10e224c0db3b8ca2fc657c097bfd016b3a07898fab936
diff --git a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
index 5f7490f78e51..581d08d5b390 100644
--- a/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
+++ b/dev-perl/Apache-DBI/Apache-DBI-1.120.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Authentication and Authorization via Perl's DBI"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Digest-SHA1-2.10.0
diff --git a/dev-perl/Apache-DBI/Manifest b/dev-perl/Apache-DBI/Manifest
index f4c721141504..ca95d6d0ff32 100644
--- a/dev-perl/Apache-DBI/Manifest
+++ b/dev-perl/Apache-DBI/Manifest
@@ -1,4 +1,4 @@
 DIST Apache-DBI-1.12.tar.gz 35017 BLAKE2B 876c9d98cd087e5e7e057d3dc298d2fa90aae6777883386e6fd33241c229b601e2b71edba3ad54bcdcd0f6ca261f524466cbe7466e0d12c671b2f165d83ad4bc SHA512 5b989856f7b6cb75a7a7a9b1ee8e166a1f5aa03475574d340933f135f813d55806f4bdf878faac49cb72a1b00f4ee23ddedb90909869771f4d613bbfd4ed135b
 EBUILD Apache-DBI-1.120.0-r1.ebuild 401 BLAKE2B 9d512916c48bb469fd32b8b2e868a539cd931bd7958e4ea08eeb86c6cc91fbf7cd3552e3b929c7b167a3456e3ea3fb7a1772641d2b8038395fee7756a9329c1a SHA512 eecf2b5da1bd2027e21717e989716c7e2517a6f4016a31c7ff15c42b1b96683b06c6bcca9c3bcac7299fef3419961803e84628321fef6972644e6afa6b991ccc
-EBUILD Apache-DBI-1.120.0-r2.ebuild 1568 BLAKE2B e852d540b1454e64fade52c9bd438cb627b2fa08b2c9576046341ed9bd01337a013be98483cebc0c3add3f0c1c36a9d189f53f4de47914f8e042768448dbb805 SHA512 d133ec87c6998456ef09c095e115a080d50d0e362059190f1788266794563f152531767dd7238b4520dc7d8ccd164d28f56b5eee695ef3e00c51d36c7305d0c1
+EBUILD Apache-DBI-1.120.0-r2.ebuild 1566 BLAKE2B 2150b2b54c46577987edc3be5200ff47e7fc90d5dad4c1f27f5c7a0f0fc4c4f47adb3adb79f9f28c6891becddbbd7005fbeaef3095a931e1b2ccf4c19b559f43 SHA512 5bded83992ce3719218b845a410cb340d815acc57c47d22f9f29aec830ebb4e49f2415d689885d92cc71ce7763899e6d6e7531cdfd06c72673b408fe03200386
 MISC metadata.xml 516 BLAKE2B a5b9c5b337fe796ba4ff013fb89e53b7d0291b76455509ca1eba34ca2d55347c98418614cf52aefdc3e14c9f92f1c19327721577c168df7b2cc987a88d8fc9f1 SHA512 64f086390369d45cfc2c13873edfd141598e9d1e24a8f5be4d62447bc8b1b49a807eb4577fde3457ebd29b025e1fd8c605f09388317d2e81822484cedcc8f507
diff --git a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
index 0a0a36220846..249e3f62cdd6 100644
--- a/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
+++ b/dev-perl/Apache-Reload/Apache-Reload-0.130.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Automatically reload changed modules without restarting Apache"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="www-apache/mod_perl"
diff --git a/dev-perl/Apache-Reload/Manifest b/dev-perl/Apache-Reload/Manifest
index 1ef454420142..f4638e990406 100644
--- a/dev-perl/Apache-Reload/Manifest
+++ b/dev-perl/Apache-Reload/Manifest
@@ -1,4 +1,4 @@
 DIST Apache-Reload-0.13.tar.gz 18908 BLAKE2B 7e231913a18c86b3c5e2e65ed2ad68e3a43451e256f8ac911d140a96b14ea32db69b7f3ffff07dfc788467721617659be3293854ed6e219b6b79c7cbffcdbe3b SHA512 7209fbd682093cca5f724050ee71d8bd26d101c3edfedb2cdaaf2e09df903e1f12cdf5cb6f4717eb8814802924359a01c89657dd5769f94c46d064db30c9f7e2
-EBUILD Apache-Reload-0.130.0-r1.ebuild 894 BLAKE2B 32bc879ef17666d88363d74dd3f0bb95be43f1671839cdd710b254f5cf6c7b74242f509c1989ebb2b74ac812cf55dbe3f3ea8b35a99d19c504da2b2d360fc370 SHA512 169449a015de0cf785c05b2fac579f54bb1148406636c96d84815f18c2569f8b38e1ea3172fd3c5bd6670e4b13a986a02b9d8e795c9ec302e590bf2ffeab0951
+EBUILD Apache-Reload-0.130.0-r1.ebuild 892 BLAKE2B f494dcf696907093bf74f7cfc66b817cdcf8ca99e1c774293798a0745222a82b1e32b6738cee1fc46d2f43cadaa14730129fe4985e11ea5a5c37874685ff8dcb SHA512 05bdf23280ecccd17f03e733f4ee3d24e59381a2452f04b9b833143fd9b6de4dcd34a3928decb74767267d6937cbd655c6378876d5a8ad2144771ed6bedd4f5d
 EBUILD Apache-Reload-0.130.0.ebuild 353 BLAKE2B e36414431dac1446ce16844e408d0a1203ff3b71e28a83973a528bf3ab1c0d7b0ecd33ae72965050e26f61e0589bd73fbe2db071c2832e9b5b3429ee12e9020b SHA512 35ab3eb1929e6cca7797b065a23cf7589032972391375be53c6375f30f57873ab3cda7926c21cdd5e5a94a88fc68f850563ea83b866c5c02f437bc4113a96a0e
 MISC metadata.xml 460 BLAKE2B 0169c6cd7a2cc00a4d8e8b24a27725dfc4dac6b7ff8d954244c011378125ad17d0a4187d52b914eddd348edd438299e9cf2e69d4f711d0aae34c3227c8ee5bce SHA512 32eed8bda0e8d33f80d3411968943ab3c7bdb59a434de549800799c6779f825fa1b0cd4d14f6a69d3c96441e6a5ccbfd12b9f6341f64606d138c4e8d70947463
diff --git a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
index 9c9d2223bc21..43948524b51f 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
index f918305f588c..a81ef460023f 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -7,5 +7,5 @@ DIST Apache-Test-1.40.tar.gz 151801 BLAKE2B 0ec57b0a8a0fafc8d10409a3cd02308da67b
 EBUILD Apache-Test-1.380.0-r1.ebuild 702 BLAKE2B 5c2acdef45a1573fa80c61850c454b2c91d5d3321231100018c1184d4b57460316e77b92eea46d3e93a581554b38ae1c7614d15e114393bd01646b57126ca48f SHA512 7ea1d14c691f16ae5797d0d553bddd5c45b24b74e5bd13f98f126c4cce2654989a039b3dcac18153cc68d33e44bb5a1948b38253a20b991b6ac661e70a659a37
 EBUILD Apache-Test-1.390.0.ebuild 754 BLAKE2B 317c368d4dd48b4721b17c86e529e3f6b7c3aca329be33506356f68aea2f19e15a3baa043c6bd93d789b01b76a7d82cee37be8f81015b6286dbc195cff039f42 SHA512 4d4642738553febf2b2f70f2f3d73ddd86bef2c4d3be15b919d8d84bad1d78d74f68b057ccbd51950445172808a6df015088a4563c91659a3f5a5a11f2411e45
 EBUILD Apache-Test-1.400.0-r1.ebuild 751 BLAKE2B 6ab0d1f645f635a0e5f0d24f2dc2d5c5306701234e9634b767991e485d5fc4128b5f399346661709326a1b0ef49dd6212a711afa27831a097d70010bb3eb9231 SHA512 98c6815e5ece4196621fcb12e4695f861c84e66adeb7860ad33b46e8653b266e96336628c0d7374d61f5b25e65d37c76073efc39d9ed9ad879f7a2bcf5db9b97
-EBUILD Apache-Test-1.400.0-r2.ebuild 2913 BLAKE2B 7e1448319ab2bd5485bc3e5c9174a8e0311c01b74b28b88a0cc9492ef10fd32248685087b4fad866cf1524f5e5325f8790f51b9ec17068ad4a335ae2cadb1f48 SHA512 d4ea91f7f3fbc14997a73611048495170333af108cac1001da2739f1581d3a4a9a10b8bd816cfc7409f30f8981f8ac957564926f04c2f57ec88149113d212aa9
+EBUILD Apache-Test-1.400.0-r2.ebuild 2910 BLAKE2B b0c542ff7bd875f1834297a3066159c2cfe142d6bbc79ec05f4687a541d3e1bc14c618c2b120ba1a045cb1a6f8ac9e3ab3c3bfebbaf15f296e8a7c67fd89371f SHA512 231ac58eface61e8130c45b4bf12566861966882907839b1a718f526b671073c0142b18745dec441fb25d13296160f53627da5a80f9601e55578bebd9fd0b340
 MISC metadata.xml 2858 BLAKE2B 11f5085f6e904752d042347bdb966364c063c33d1e3b1cfb0f9c47db6e5020f3cd113c24d118cdc75bd0d3c70f82ec1e906b148d9119fce815ed6e0703efeba6 SHA512 1db84f146dd887e3719328aba99809ac3ba8462226b9109310675b1722b2874cddd54b82900852082160bd47bf157611ba9f324d1f2964ee6912d4bff3690517
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild
index b9c747fa4955..ff4dc5e5cf93 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.600.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Archive-Zip/Manifest b/dev-perl/Archive-Zip/Manifest
index 28b0004877ec..8a581bbdd5a6 100644
--- a/dev-perl/Archive-Zip/Manifest
+++ b/dev-perl/Archive-Zip/Manifest
@@ -1,5 +1,5 @@
 DIST Archive-Zip-1.59.tar.gz 192151 BLAKE2B 1899ec51343250e496bc3121abea3e08cd49cd33289184ba9ef1486e9b6a3f643fb264d78f0c21d47d6889d1d50e905e9c5c6f79d385d5de2a47d41bd0102dc6 SHA512 ca9df48d770bf34945daa1721b9372ed90816b8a2a3d61523fc91c583ef545df169528093d6cd15fbc7e962ce0aab17f0fe8899fd35a6f0245c97b7cb379dd5f
 DIST Archive-Zip-1.60.tar.gz 191318 BLAKE2B 97b66b360c55ba864e9e78e74ab5bbeec145859cd551efe5a248a4ad9af7ddbdbd32ad61dd8f30bbfb7e9bb583d0463b657bbe6d67464105fd536adc6a0bd660 SHA512 5af85e1717e7026b5ebe9533b0dd57290b35099d166ee400ca648cb558a37529a3ec290fb9a44679c16cf955a2de9b75328c2fa88d3e87e51c10cac80247852f
 EBUILD Archive-Zip-1.590.0.ebuild 789 BLAKE2B a9117fdb6e2d8fcca8d10d5797800de40d3b0154f0c35890203da02d8bd53af49eea0537fb80e08301ffbe89ae649c440190d8af993dfc36ce8b47891128a6fa SHA512 3276c42e2d0ffc633d2c37e65932fa681606c576dc1355cf6562f5ad65802ebaaf9ddb27f31eee8e2ce2e96e718a43ff9d5201d5e6d3ed9ce5b06f5b298aed99
-EBUILD Archive-Zip-1.600.0.ebuild 794 BLAKE2B c6611833a26c60aabb151f1603b5393a897b4bbebfa6dcf8a8c588dd33d6cdd1e87bd4c5dbe26ecee2c8b43cc9046da3dc461a2e2412d04a9f4cb6cc1d29e8eb SHA512 891699ef72184edf674668f82d10138a8a089c85c434f09fc848416b5aa83261435b833a930d85085b5220d1ca40b556670ff12cb225163216e56a4da5ba5c48
+EBUILD Archive-Zip-1.600.0.ebuild 792 BLAKE2B 1cec25ce1939488308b4822a30f838e40e52ac520e2d3f6963fcbce832df2e68757377a88fb6f47d27d0d527f0617ed6ff851ede91649c74dd42beaec5df7943 SHA512 3cf0d2b134a1aeca4499b687a9e56828a14caa090c65cd61f2284c261a08a5d42d7365e97c153ed5fd5c22380bf4cd609d5411333d95bd4b329fe738b7e1f05f
 MISC metadata.xml 1187 BLAKE2B 93311e721bebc19566b1108db3e9ec72034db4aaacbbb3abba77d35c5c53ad87a8c57ab7a3778a9062ac452983a0bbefdf7fd11b49c23df07e043974f8922acc SHA512 cab4eed19897f888eb2ff9cc094ba567053eeb115610b0dd4093db37cb8a24488454bfda9b75668f57d37d46e64e3cec5fa300b4227fe40b437c167fb38b690f
diff --git a/dev-perl/Array-Compare/Array-Compare-3.0.0.ebuild b/dev-perl/Array-Compare/Array-Compare-3.0.0.ebuild
index 3d99df0f6481..a98c1c9ff3f2 100644
--- a/dev-perl/Array-Compare/Array-Compare-3.0.0.ebuild
+++ b/dev-perl/Array-Compare/Array-Compare-3.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for comparing arrays"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Array-Compare/Manifest b/dev-perl/Array-Compare/Manifest
index f761677562fd..37d9185c8cae 100644
--- a/dev-perl/Array-Compare/Manifest
+++ b/dev-perl/Array-Compare/Manifest
@@ -3,5 +3,5 @@ DIST Array-Compare-2.11.tar.gz 9653 BLAKE2B 4dc39175e2fe11e57b2a7a4fcd2eedaf6596
 DIST Array-Compare-v3.0.0.tar.gz 9437 BLAKE2B 3ace6ab6678d710dec33d6b923fe0f96bcfc35db606a50c140755ce76fe259d4700ace6419cb70b2501669ea730b57ee1057e525d08a19b62baf1218e36db7bc SHA512 6515aa249b49a04f70f39974e1d1c3f802a1b5d76e3e050aeb47a30cf8a4ac0089378822eb0c0aa15697bef09e49227a13c55d4914489f944c3d2f5cc2b4a692
 EBUILD Array-Compare-2.110.0.ebuild 556 BLAKE2B 01d694dbeac9cf8a6313282ef315f5c290e342c589e6a5f55fad543d70d14989097205d8ac47cee69d790d1f4470af8c28b6237e8d74ebd76c145e8248e5d4eb SHA512 94ea58e758554cc236fb5023a8c04f155b501b758260fdbe98a4f19680b5c1fb0d3ce3d315702bbc1ad410bb930eab89bdecfb9e312410fc08d742addb8056d4
 EBUILD Array-Compare-2.20.0-r1.ebuild 531 BLAKE2B 70f387170176d0b1e84219477deef103a9a29aea17c340f671c9d4b55e340bb76bdeb8bd88a8cc6d894c0fda06365fe65b4fd88ef323672a85569b04e793da03 SHA512 c19c768f5c22ee780f6acb3b066d9f339b5d8bc5f383728457abbb8b9ae60865b9209bd5b8027e0ed749f92c5470d2e96013e8675228b2bb6d65cea92e481e99
-EBUILD Array-Compare-3.0.0.ebuild 561 BLAKE2B 88db1bf3db8e595c8b38426d3c98d61a533b5155cd60af87a1308700f50a83963617b9b1e7479d6f3368839098fd3e94293a786fde90458a66a55e24869f076c SHA512 1763c6b64f9ac1a9bed87440dd4bbc25455049ede1795873e0ae75070f883a6e67bdd37970ea5dd6b2b40b2ff310ccd2393c32f5be7158a0ab9bdc74226b92af
+EBUILD Array-Compare-3.0.0.ebuild 560 BLAKE2B 51ff37f0ba4b106d469aa2f52533971b97993d2a97aab2f0e4acd56de144efc449b88742de15bda5e8cc7126880de65a6d34e551ffc29f197f90ef4c1066232d SHA512 b31eb1c8e06c5bb487cc92cb4160ff670ffd9b9c8b536d15fc896e99a31ffe9664f1c47c324fd5bf9f0d3d7c2773f2ce64d704d7d53b25934ee4ec084a2987d1
 MISC metadata.xml 398 BLAKE2B 85cb87dc087cbebd9574646c7150148d694e937bc508a2b7f402811401537c5bd1688c957414dedf47a6c103683c3de5bfec4dc620aa23ff341bd4eaf29c9e2c SHA512 72ed7b8e8ecef772f37fa18b6938b1fe4b8cefbb7c13de073b40610a14034d9771b93608239e0050d9eee2f16d452872083049c38b9505b02434544504f90128
diff --git a/dev-perl/AtExit/AtExit-2.30.0.ebuild b/dev-perl/AtExit/AtExit-2.30.0.ebuild
index 6ae89fface45..5fe4b271a214 100644
--- a/dev-perl/AtExit/AtExit-2.30.0.ebuild
+++ b/dev-perl/AtExit/AtExit-2.30.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="atexit() function to register exit-callbacks"
 LICENSE="|| ( Artistic Artistic-2 )"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/AtExit/Manifest b/dev-perl/AtExit/Manifest
index 1d83d78bcda4..f96a65a6752e 100644
--- a/dev-perl/AtExit/Manifest
+++ b/dev-perl/AtExit/Manifest
@@ -1,5 +1,5 @@
 DIST AtExit-2.01.tar.gz 8081 BLAKE2B 51034b0f12c7155e1e70be410543a32d981ec5ccfc6ac1875792ca1beb91e59425db5280cb6d57347a3b2b20052dc69f9d4482f850b02d7108df7e489f0734ed SHA512 5eed5c2ef0f3de66d2aebbf09293c4c03dc31947cc71e49a6cacc332f17f3e9ba9b35524713180a8dddbd72677b6d752e144720ca7b1b0190a91789a9f4a7f5d
 DIST AtExit-2.03.tar.gz 11263 BLAKE2B 0ae54e3eded9bda74e314f1c5b6c7d9013b479671950f0fc390568f7f6b8a715dd2c59b30ae131669fa1be8565c9f088ea9763ff765314b11eb4ee55f98a7979 SHA512 ce522b44ad5c2360c8e7f7f49257fe50f0079bd2070ddaa33916b2484ef8e6f6430df045e5693356c37651aa96ef6a7e7694a04ecbc91817d12d032681105b60
 EBUILD AtExit-2.10.0-r1.ebuild 292 BLAKE2B ea3205f17bac0e6b45fcf8c42cc56be3508cf45ec76aeb6b478cb144fbe3a50c5134b1734c4fbad276a819ee8fffb7f417779cd5f0acda87393d7b33fb4e39d8 SHA512 7c52fc767620e987e64f8afbc7f73b01f02fc25f3757337faf88d85b7f3178aff1db52471b74c083e8e40a72188a5ca1a4e2ee7fd07fbbb56eee8645cd49b550
-EBUILD AtExit-2.30.0.ebuild 482 BLAKE2B 3c425d91fbf23ef085deddd3381cc1d5aed2d74da6983a93eda528a289b113f5133e4ddf80ba43ef44ebb70a745d4cd74c30a7ab9951207f90f34f3a937efe31 SHA512 b5d78223f1e181ba5792f5fca6045bf5c5820d2c5156d11ba2b12f6fd50916773a9ddbc7167a636ed202543e78e4357bab2551e6d3992dd4548b2cba99fc4b30
+EBUILD AtExit-2.30.0.ebuild 481 BLAKE2B 71660957716250eaff181c72c068311cd5a753ed057e4f6c96d1f9814381574c9bc8cdfe532caa572084c4e15bd4482c667f5bad8667a0a47e9a0d0c8bfdbc07 SHA512 51fc13083efc6e44ca48b88a2b0af86766a1708fc7d4e1c445393f331c3b686717fbec39dfbd17d9eef532b22325cc7c9e69ae28f4acc627c14a4ac061b699cd
 MISC metadata.xml 383 BLAKE2B 1db1252e3d0773771b653a0f45974f9110831bbc34ea22619b77436cee4a1a6963938029f9279481d0bb35636df97f95799a0cb238803313aa2d5991d99b6c9a SHA512 fd7e5188a35b31d2f96c87b24ded46c3d0a304fc837320b5103bf96344e09ac0fc033d667569b47e312784cba26ab44e4949b6d1c1de79b50700773541da3228
diff --git a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild
index ec2bdf26b3a9..e827cc4d7482 100644
--- a/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild
+++ b/dev-perl/Audio-CD-disc-cover/Audio-CD-disc-cover-0.05-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.vanhemert.co.uk/files/${MY_P}.tar.gz"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
 
 RDEPEND=">=dev-perl/URI-1.10
 	>=dev-perl/HTML-Parser-3.15
diff --git a/dev-perl/Audio-CD-disc-cover/Manifest b/dev-perl/Audio-CD-disc-cover/Manifest
index 5a3e5acd29ce..adbe0799e115 100644
--- a/dev-perl/Audio-CD-disc-cover/Manifest
+++ b/dev-perl/Audio-CD-disc-cover/Manifest
@@ -1,4 +1,4 @@
 DIST Audio-CD-0.05.tar.gz 10417 BLAKE2B d33b3286966af96df05d8e7228dc19b4752c4d2e48ba39a9b3b6594e4bfe82b0ba7b70e29bc8ebb39b9a7e7bf8000dde1abe01197600a651d5a2441c707fd161 SHA512 c4d9a6ff57119431315329a92accf9c0f6b4fd52d1fbf9d6c79743b50ac73ebddc6b541a7807344d6eefd12a7681945b4ee3885abfe32acb68b9d17d070d6d09
 EBUILD Audio-CD-disc-cover-0.05-r1.ebuild 867 BLAKE2B 367375ca8926b6cd6b18913d31eb3b4009c7a5a793046a5722480aa49411f8b592102c19cb544e19aba14ab2161e97eb209a9fd1a2fcc03ccf6abe9997c12a76 SHA512 1d14c1de36dcdb6ce3ace7d37c490a135568389cf011dc8a45310e2d5fae663f808985f26986affea4cf7a1b41eae41a30b6b8bdecba1fa2286f66073fb71471
-EBUILD Audio-CD-disc-cover-0.05-r2.ebuild 1318 BLAKE2B be8c6636e2d024e60c1323af6cb766df5a47480c58e9f7c4522804d8ae47cb2aa89b8b10d54f894db491fd71fa8b48f3690c738447ffcd7310106f3b98fe1112 SHA512 ede1c46102e28a35a9bd4880bcbe66fec685dc57bb1038457449985a03a28895925da8acab559521083f0bd652e8d013c4bc05acedb09e18d391cbf0e3b6ed6d
+EBUILD Audio-CD-disc-cover-0.05-r2.ebuild 1317 BLAKE2B 2ad5b4c86e94c6fb42efb9fb6b37d907d2b0e634755d81f3bedeb18716de2eb80aae524adb4a2d720bbca0503c9a351739be29cb9695741f98791a250c2807ad SHA512 3d4051473384bf4936e46c1ebb1cf11a2998d15a6cd93aa1c2e06c6946e79fd4230a97ed33c3e8a1b1157b5a5b48f5c8dc67a0d4e76ef17f01e906fc90ec8765
 MISC metadata.xml 388 BLAKE2B 8c9a052d190854ce7f52b381e740dafb6669223333566d6898552aa197273063337316ea492398c7430c9676f6e63b6505f4689e9f252dab0226dee889d61935 SHA512 2cb3255874a04f083cab08182f7d9842a8b5a800cd6f44b9854b32a6778b6928920fca9f73082bed132a0422d7e8d160c8df6c175e1b68e32cbd2af95380303e
diff --git a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
index 84d1dbb8cfe2..95ebe3b204e9 100644
--- a/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
+++ b/dev-perl/Authen-PAM/Authen-PAM-0.160.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Interface to PAM library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="examples"
 
 RDEPEND="virtual/pam"
diff --git a/dev-perl/Authen-PAM/Manifest b/dev-perl/Authen-PAM/Manifest
index 0cc6e6159702..679a88f7b138 100644
--- a/dev-perl/Authen-PAM/Manifest
+++ b/dev-perl/Authen-PAM/Manifest
@@ -1,5 +1,5 @@
 AUX no-dot-inc.patch 1024 BLAKE2B ba54cae4654e003da18f1c733a95cbc9fe474981e3cc90a9e957812da306b2be89721e82f34f7bd3df14acbb254e41587786d0ecb9db35a3aff47db1c186fbaf SHA512 1701f4b03709f46b7c84a1ed4c38f75f064149306dcf5e99d8f2e40256600b6a1003dae99287ae4a6f1ce9ba9d330d21c99ad9a33982486f1b2f474d1df00120
 DIST Authen-PAM-0.16.tar.gz 45922 BLAKE2B 87f0097e1ca608e5b86410a0ddf7fd0343ef9cf7ea2f3051e9ff5daeaed21569bdf9735402402cfb66744c945f02b13594893146270b95fd91bc7d11988b4ccf SHA512 2419698193697cb8c9ac3a1527a25abefffd9f15f4b492006081b2c8e7fe9e01e00f33e8fed6a07611b725b38ed92d9feb51b8ba61e4c23313cc5ff9ea1c05fd
 EBUILD Authen-PAM-0.160.0-r1.ebuild 409 BLAKE2B 8868a9501b1870ce181190379ca6562bd4ba7999e9205a89ad1670026a9ff0e4590ea300ba6cd7b28ae51eaeca8b6ab58adc68094dae9888be7af65366d3d5f1 SHA512 8d2d109683cbd06332050da733242ff3b9e83dcbb3947161396d3920fcdacd2991d3ed3d135ae798e88ee5c002fbdac98ded5a0a8b32aae73ac1a56944e40602
-EBUILD Authen-PAM-0.160.0-r2.ebuild 1063 BLAKE2B 8af4186d1a9637e124503d75a9b43be4126bde3c89453d4fa1b5c1b2f68260ebaccbeef3a266897d6dc3c0c71a4a23adec77c3aa08ca8599c20c34eca967762d SHA512 16f767a4f40fa431921320c43666d755a395d8594e9f491f65b5eb490ca41d3b615c85a18408fa2f00ba0abfa99bc9882512118990f7e4bf54141ca62aa773db
+EBUILD Authen-PAM-0.160.0-r2.ebuild 1060 BLAKE2B 697e377c0990aafa627b6bde668d09f1fbf94a45a7541d90d4cb5d638be1c0200fa6a90fb7f854557dc8075d4296a53a702bc8a82b6f76c98017d944a44ad832 SHA512 d2e5f306c36af8739eee8d9d313b94f1763c0ad2cc17655f9ab76503bd6f9483912e9c071a2a95e645bfcee3bc4a9893243eef22573558c511978e02b0a6c33a
 MISC metadata.xml 392 BLAKE2B cc59e0b968461f101b4403721f80dc27f6356c349032d539583ae900e486856f54a6e9cc46c414fcf5cbc11c551bac023a34f33d59cf640c90514074a550ee55 SHA512 bf28ee065f5033975b0d31647b15dd73d879b03c2c30a40433f8a67b6cc3b34ce483f985adfd29ab135b73d6f2f9f6d62e40beed947ef4eaec970902762114fc
diff --git a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild
index 725fe1e2c204..d9cc55d022a6 100644
--- a/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild
+++ b/dev-perl/B-Hooks-EndOfScope/B-Hooks-EndOfScope-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Execute code after a scope finished compilation"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/B-Hooks-EndOfScope/Manifest b/dev-perl/B-Hooks-EndOfScope/Manifest
index 43063baf6742..af83dd10bbad 100644
--- a/dev-perl/B-Hooks-EndOfScope/Manifest
+++ b/dev-perl/B-Hooks-EndOfScope/Manifest
@@ -1,5 +1,5 @@
 DIST B-Hooks-EndOfScope-0.20.tar.gz 33286 BLAKE2B 7b93189f5c30608add838e01a99a5036582fabaed6f596c2edc5abe939b03eb4b0ec718c35f515b1052eac3297fec35ec2980245163a77d8264d1eb3d2d1f1d4 SHA512 b97d762029e3c00836149fecc7d322ca871a3b4098c92a4224465b3e851cf23f7d836f07d76a04ce4ad6564325895f779acd4af8fe76838f87d184c2ceda3ee1
 DIST B-Hooks-EndOfScope-0.21.tar.gz 33336 BLAKE2B edd3c9428dbe689e1528b76a0383ec6c85ccd35059abbfdc0a6de613ca5648010e89a9f7fa34c627130ac81a6c247da6fcc7552dd6bd12ce676fed73de26ba8d SHA512 6c34b5e6bd9b355703339b5ec7625e8ecc94a4d38bbc1a94fb561c8832234a80a1d5f0b389e4479fe75a85afb15d9e56092c2c1ceca0c995b39fc5ba0e4a563b
 EBUILD B-Hooks-EndOfScope-0.200.0.ebuild 713 BLAKE2B 206bdca9cb6ed819ded5d1bf122a6b1fc25666a15152471def7a739d5651768aa2977b7e55e9ecf4eaa60fe6b9e823ecd053dac0e610a6fb7718a9d17fa08f05 SHA512 87cbf75ee5961bc931aa0f22477e6530af66a20628fce7c206b0e128ce71047015024648f94b2280c10ed767a91cf0df8bb856810ddbe8a0bc67a2860f36a62f
-EBUILD B-Hooks-EndOfScope-0.210.0.ebuild 722 BLAKE2B 3714d38f6a86f4b99f8920720d04c2b2cafc3192a401e808c68088440f139c4277f38f4a522943d0eb5fe9d239a9dabad92684678090b760146c016f85507bbb SHA512 86605223bdeb29c137d164ba135379f094f671122995076bb78068d307c3dd657f6ef008f03efa3c237c772802b02f9ec36aed61d9984bdad5df0245ffad6fa9
+EBUILD B-Hooks-EndOfScope-0.210.0.ebuild 720 BLAKE2B b7450c532f716cee5f4faf9795db7f5b993d74bf22e46df8751fa5ce3845b127743678b58aa362d6872f1af37e79cbfdad9d5d90f36eaeb2fa5bc29021ad086c SHA512 5cb3255260b9cf7eae523fb94431968c72fbb6feccc6781bafc9a7dbffd40dec6aeb79b64bc4ce239dede7890a479c30f0b737abee7bbe11e742e6d6a79e8b26
 MISC metadata.xml 551 BLAKE2B 1f029ceea8b1946ac24943bfc3071524b2e5c245d8c9806383fa46d6e761f4d7ac84868acd65936bde6f98746d4df45d7af2b089bdc29c3593319194bf755cf5 SHA512 3624449a7844dfe649ebc7dc90e197a496e92a678d8d08009e164914198a1722b4cb3af43590dab725281d45c70c0414b3bbe888bffc0702e774f0e066e1806e
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
index ce7343f4f8c9..9d265db1c332 100644
--- a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Wrap OP check callbacks"
 
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-parent"
diff --git a/dev-perl/B-Hooks-OP-Check/Manifest b/dev-perl/B-Hooks-OP-Check/Manifest
index d7f2a11a23cd..93e5364da55d 100644
--- a/dev-perl/B-Hooks-OP-Check/Manifest
+++ b/dev-perl/B-Hooks-OP-Check/Manifest
@@ -1,5 +1,5 @@
 DIST B-Hooks-OP-Check-0.21.tar.gz 76100 BLAKE2B b0a0f91570cfbda47f799eedcd657a54d61a886ebc6b0bd130832aef96b7bc394b7287706ba7cf1693ea6937f61646d36604e8bc035fb39fec5458894ce1d537 SHA512 fb816d9d591b501c660668c170e368bc6573851736196a8c533720f651b8df30bf38d93e697606e868e19aa9ec4a5d696a786b102bf2284b82cfb887a5a83c2b
 DIST B-Hooks-OP-Check-0.22.tar.gz 76535 BLAKE2B bc0c6b7b057fab226ebc44376eecc26efd58b699ca87588dfc25d2f539f955f6e657a4e206430b80fceb5039d3203af75ace76d0e86b85bc734b8befaf0bd9aa SHA512 e68b08a34244afc73d7d3b2b0acdf8fe791b0b1f087b6b0496da0a1e655a9e51552ec8fb0f743c8626a0414fb469a2133d113ff5b4ba9f96217cc87bef877542
 EBUILD B-Hooks-OP-Check-0.210.0.ebuild 486 BLAKE2B 3c8f48eb31d01664fbcfe4b749bb7b5ee04f067e0807ca15f1092f78fe25b6c2bf6c8de7c6f843d067d4f67827adddfd7ab9cd236b8b6a79ad1b8a70e9dc860a SHA512 0e59d7fa9b747b44a6a2210034483613223db02850779b7261b9c2cb97031d1f6361ca09b78d597b6062a7a4e6fdb7d9791582c3f70031b66d7a7fce5b811890
-EBUILD B-Hooks-OP-Check-0.220.0.ebuild 488 BLAKE2B 7e8b9b5bf19feabd471aea07df9638f0cc1029545e1e7ceb8050f6d4800d34dbb7e6b457f26103bdcd98cfeaab7f749f65ab6d71255730a2d539ae9e879d8abb SHA512 79427d07f46690b582296dbc865ef3f5e78f8479aedccff1bcda8962c5d9001361ca7feedb1378332dfc61af9fb60e4e07dfcb52409c6407b7d1aa186be2cc03
+EBUILD B-Hooks-OP-Check-0.220.0.ebuild 487 BLAKE2B ba0713032a6d625de9a3dbe521b422cd9354c1656fdf91c3a575d3b69832174663f5d2fe420253ef60a85ba866798c64ce020ca47a0af1681a4db86c7d3a202a SHA512 63fa3dfb4b53d32b9561dd019dcbf6791c528916c224d581c3a3a81b7dc9c9e6b012c3518e1b26a4a7f0e6911102824ecc7fb68072ac80eda43088faeb325253
 MISC metadata.xml 406 BLAKE2B b4956eb9a09808b0d00400a10debd60ebe56f1215212e14528d468144d1b119a0dcf2404aa07317f42222d7b0ab8760fe35759e700cc226076f2de44cc382377 SHA512 568d5590456bf5ea48ec90100403a58a2ced82657bd876d6850571c49fd932b438f882b85bd6df6552a1129c585db8bd8c32b1870da7f44ac3fa211ccd3bc57e
diff --git a/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild
index 65f32f14f894..d3bee3187373 100644
--- a/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild
+++ b/dev-perl/B-Keywords/B-Keywords-1.150.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
 # GPL-2 - no later clause
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index b754f03b90c9..3b9cf5226f91 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,5 +1,5 @@
 DIST B-Keywords-1.14.tar.gz 9981 BLAKE2B b8df2816b2dcfcaf86f78a7669754f645715bfd9b7021298fe406a53579263c0d6094d8158ebf0c59617a499060996cb29208557381e193db502024b48d7e628 SHA512 62e10e0f22fdce9855d7f4e1e96c8a2063a220d663ddc5ba0cb1a2e1b398b4f3a9d765dbc122797a66475535b5b6addf8eb655c8b27428355bc00e598930a5c4
 DIST B-Keywords-1.15.tar.gz 10140 BLAKE2B 76cb82b4ec6742bcbb45ee41027b44f2da686560a515f1de7144b9daf89b05f942253f941195a0fb7718fbd5d8d35380c9f643c802bed84cd24817f74c696f5a SHA512 41d06de68d010095efd643153db10fb6c3cf33e320d576f76b9b60b2a96d1f0ad9da41741b4e57a3c78c8516197b81a5a6110cc6a49ee4ddf1b33085d7bcd913
 EBUILD B-Keywords-1.140.0.ebuild 474 BLAKE2B 52c57a52481e781b4325a167a27459c632e2e6a68299ca5e8757a21d7c50c25697fdfa46d4931a83393136fe07d821539ef4c8c928b7f113d0205b824f4b4abc SHA512 79a30de78766a7f5b2e1d975b2300625abecd49729f756008728d99675cc5d85db02fe276ac97330585fa1c4f3846192b74c39611d489a69acb513b44c1028fb
-EBUILD B-Keywords-1.150.0.ebuild 456 BLAKE2B e5400bb25c83c620546ce34e23b341223963f25b059c6d231e3e33242d9c4bd7b788ed4edee8b9307ec0f5586f973b4955f29c7182c064d27a9f8df4359f476f SHA512 642f659dff020e5a971905d00dcc13ee0889c79495685325f2d44a27d6eee95177a649dd5a7fe93666c650269e41bd5579db1bf6c295bbdcd4417064194b4dba
+EBUILD B-Keywords-1.150.0.ebuild 455 BLAKE2B 24da3c162757c1307e2f08c630da68cb019355d1d133ca6e56073593400371f3b51ec89afd4e712de086fda12845ec6a10a94162ef4792382873ad0d2cc939e2 SHA512 057f6ed2104bfd6809c5b0d748d70d7a33f834e2f358fca43fc30c7ab67032d44b15b2ce138a5107c05823578bd676965de4ebe0dfa790fa2944736759ac8383
 MISC metadata.xml 392 BLAKE2B b8d12e7f59af5510b05368c9873c7c3390cd634c859d68e48ece440aa0dcfd953767a20c94b8f6a8223163a68adef750196d1f11dd8761f6341664a727c893b8 SHA512 db120b73badeb1b6de7f1a4d4a7b70a5d4d1f763c784e04a548fd49ccc84620283cd4ecc4d6a0b3a258de07d76dfc264e40234e1e93fe79e10449669ade41073
diff --git a/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild b/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild
index dbea2d4138c9..ce2f22368132 100644
--- a/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild
+++ b/dev-perl/CDDB/CDDB-1.222.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="high-level interface to cddb/freedb protocol"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ppc sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CDDB/Manifest b/dev-perl/CDDB/Manifest
index bbec16c4ec12..bc60a9dc38bd 100644
--- a/dev-perl/CDDB/Manifest
+++ b/dev-perl/CDDB/Manifest
@@ -1,4 +1,4 @@
 DIST CDDB-1.222.tar.gz 45771 BLAKE2B 631566dad71e2a10103b749e4139f6bbfce67a1fdd70ce1d09ead9bff5d4faa2aa8d2d0e8d8ce962d76fb40aff2f7c57ee4ab87712619ca19434232e3c6dfa3c SHA512 addd0f4f3fecab7d599eb7ead93828d6a9c74a779a344f190a629e666c95af47b5eea05f885564a90bfa1fa6c128dc3e60e510f295f6f35b3eae2d8939109d98
 EBUILD CDDB-1.222.0-r1.ebuild 306 BLAKE2B c841ac0649040c98a80da4eec4de6762248789fb0a2c59c863bae314db98e53390a35e013d3cbd01a879b118c6086243e27130a624dae9eb43f089cad3361da2 SHA512 0fe712d984f7a4a137b68c9bac968fb6d0e8471933982b8f6f6034449f2e59d33339e431355280f2614cf4ae848535ac83a6e6b62083264c7a615becf9fd2638
-EBUILD CDDB-1.222.0-r2.ebuild 2097 BLAKE2B e3267c07b2902f27e38d036fc56c660592e4535759a7d2770a9a85fec70f4bd9636f91c7eb2ff2b96d97bb0c261d7ecd67ff25825dccc12151c8b50ea9b59a96 SHA512 46f129f7127e9d8825e9b07fd7a7e4f7033dfe91a09180bac257b34f7c6f30380ab8f3a09ff350e80ed21ac3e4b605add566fdea6ff6baa324b8fd6ce63f4b8d
+EBUILD CDDB-1.222.0-r2.ebuild 2095 BLAKE2B 4dc80c2c02db0b5c4b372e2f86c478f9850c8de090d5996456e8d86669ed673660d9f936010f798e4582d4c10c5ed51e486164f6074395f6cf7ed78b7a119479 SHA512 ff71b8d40254faf2ad0875a5b2ec624fe722fb0005ed7c04f0647c9d2766d467eda225b74c78885e0c6f810e34c149522b6a5f403cc9dbd73527644381902250
 MISC metadata.xml 379 BLAKE2B 332e90ae5b1665c3fa5fb6e93d5822d6baa297aad380db89e0553870951fc4d00d8f075ad4608768a3fa6196721a5284ca19828a1feec64ec833a39f8fdab8fa SHA512 a7c4f8674d52d241ec17c5ef165bd1e8103cd2401dab1a03a42c0b6283ace39914ec03a4aaa73eef505245373ad0f4c5a6f324f34a3a9c0848fd8926378230ae
diff --git a/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild b/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild
index 5f7dc17c64a8..0539dff5a284 100644
--- a/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild
+++ b/dev-perl/CGI-Fast/CGI-Fast-2.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="CGI Interface for Fast CGI"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI-Fast/Manifest b/dev-perl/CGI-Fast/Manifest
index 2a1b55ac9ab8..a9fab5c93151 100644
--- a/dev-perl/CGI-Fast/Manifest
+++ b/dev-perl/CGI-Fast/Manifest
@@ -3,5 +3,5 @@ DIST CGI-Fast-2.11.tar.gz 8662 BLAKE2B a057f9b3f1e83c84f6267be946149bd167a08b605
 DIST CGI-Fast-2.12.tar.gz 8807 BLAKE2B d156cab55ab6b8c8ae882357294aa7c28ed61c9ef8dc3cadf340fb8992e61ded967795061377146c7111ec576160c2915f3309312e64b3e636db11f7c21e4e1a SHA512 00452a2c31eb8fd877808764508a491894d87986bda493b2b15773cd29f2699184559f0c55af1af1684c851005b61eb1364bccae7ba4f4df3166d9020c15b40e
 EBUILD CGI-Fast-2.100.0.ebuild 578 BLAKE2B 7c79c9f94ec968d920ded78ab3706cb172a01daf6c5752222607ede2e40936ba66e6c25f9ea609f232d4dc44786db5e3d971322d8bcc45d0d2a882c83bde3f96 SHA512 45ab65b6a135b10ffb5458fdc2a45ef382622d42cb93f45a223124ed036a6eae58d357f0410a7f33f1811cbf644a681a3be0d067e4b6e29287d60bdcefd879af
 EBUILD CGI-Fast-2.110.0.ebuild 600 BLAKE2B 6597e716cdc90414219244baa23fb011b1d7af88ca929d67e658d6fa1993068fc7f6db4d548be0552c46b83acc2f7b10b502e2e880ca5654f4f9e9b65caa9b87 SHA512 d3067abb78b0c633983f117928510e730a2cbb40847d357b1fd12e0921d80ea29c738d7ee3d86a1dd13b01154cc6a710d5fd70442b2a6ef9db511854eab616a6
-EBUILD CGI-Fast-2.120.0.ebuild 638 BLAKE2B 5a2fb1f6d6b4272ed167ccd0fc04c0bce5a0361bd168e059488b9f04b49c3b58a67e52200c0a77be81ead81801ebca541046daf281f813d9d8032a269452127e SHA512 aa47ee47079446442ecf7ef9bf03fc625fd5ad983127894b7d7b65ae787d1b3a25b92d34a4fd47afac483c14b7f52584adca18ee3cf0bb5a2c6a2dd00d5f096e
+EBUILD CGI-Fast-2.120.0.ebuild 637 BLAKE2B 369af185b175ef0d9b1f7c4434a044be66b0f11d2b466d6ace60fafd2ae89c125bcf056d548a1da00a662519afd166f03e3cb0fe4501c65bd857d0bd6beee065 SHA512 d4575345e397a0fd3fc20eb77c0769ce05d1ba4f70b96eafc37ae0a560bbe8cb86850201564723dbbc5ad0175475e1233e8929ff2589faf09acfc8bc5a8dd6af
 MISC metadata.xml 388 BLAKE2B eae3b4d4c39119e174a7ba3675bae1fc2f284c6e36739cbe42f886ce5aa927c57df46afd0ec8fe9cfd0904807f0e41dcb07514baa23c6f3e930d8a3f9a03f10b SHA512 9381464ca55695107f53c7ded8490e9bfe24f3ffe77a4587a84624786c2125f28eb0b3141711bc27f934954c8816c72e7e6ef453918bcd16b832b7d370c76f1d
diff --git a/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild b/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild
index 8c01148ebba1..1ccfc322d477 100644
--- a/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild
+++ b/dev-perl/CGI-FastTemplate/CGI-FastTemplate-1.90.0-r2.ebuild
@@ -10,5 +10,5 @@ inherit perl-module
 DESCRIPTION="High Performance Templates and Variable Interpolation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
diff --git a/dev-perl/CGI-FastTemplate/Manifest b/dev-perl/CGI-FastTemplate/Manifest
index ed9e25b9e00e..4397986f6073 100644
--- a/dev-perl/CGI-FastTemplate/Manifest
+++ b/dev-perl/CGI-FastTemplate/Manifest
@@ -1,4 +1,4 @@
 DIST CGI-FastTemplate-1.09.tar.gz 13635 BLAKE2B 8be2c1c6959ba08f3cd0b117e40ff29a8fdbe0f174848852478167317b2f14bfdb184346cbd7c6e0aa2bdcc4baac0ce9a55d00b2602ead8c7d1efbfd9228d606 SHA512 ff8907573d86cdc534ddd8f1b3b1d697df9eab429510b3b090371f01d856d8a374a7a0cfe0a2709468dd5e8be1b5738801859e0b138adcf5357daff09343136b
 EBUILD CGI-FastTemplate-1.90.0-r1.ebuild 286 BLAKE2B 55b9d6b17d9efbfc7cd8b71a7ef2926e32174097a844f0babfa7f3fca3d3588b120ee67a6518e130eba19c6f7bf77f0095e7316158cfa2ffae4fdd021a8762ea SHA512 f0ae24066b36eaed79955931ba40a4c361d3ac0535df7ae846119c40b4112063e96262e3df81cf95962a3b4f40784e8adc5f69bb41144c5a1abd283a506a4d15
-EBUILD CGI-FastTemplate-1.90.0-r2.ebuild 305 BLAKE2B e61db2c929b0a77360483ea019782472492f5130c0795991a5a0437bc855298ebe39122ca810808168b32ad9bc08f78e2a8c14ebc378475da9114711e2579605 SHA512 7aec2ea7d70592e826b8d18270bb147d0ac03bdfc7618c8f23e81630eb48be22a8ca951529f5b5120c3464a7ad95fa7c87e25eaf8428bfb9ba15713982e9fa86
+EBUILD CGI-FastTemplate-1.90.0-r2.ebuild 303 BLAKE2B 24f7351c0784c4cc33beee4103406d3143ecc47847f6efb145adae5995b8d7a4422bf0c8d324791fdabdf22949d7a7b011ba234762d79162f796785e32dfcf6d SHA512 dea3ac7a03e4c1505fb14881c32ab34ad9717c737199c95cb73fa26a517961be301507f58e659d2ff146db8219663672c0210df92cb74f2c20fa1084fde3c8e1
 MISC metadata.xml 404 BLAKE2B bf0882b12a689614163eff83b643ee431ca81cf82044005b99f8d0763ce1811060815d9b302c0e0eb8b7b583394c95be6e5643c16d16d9f326884a3cdc58ce08 SHA512 d8813b537a7ea7d7f46b2e98d960996cd1040d452200f56754e55a42af1e1cb5ebc8f41d9e23d4c15695d047b465451a6cbcc430221ada0d2b39e0741b884fc0
diff --git a/dev-perl/CGI/CGI-4.360.0.ebuild b/dev-perl/CGI/CGI-4.360.0.ebuild
index db77d8a0dae9..791e6a0c4c2c 100644
--- a/dev-perl/CGI/CGI-4.360.0.ebuild
+++ b/dev-perl/CGI/CGI-4.360.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Simple Common Gateway Interface Class"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index f743933997c0..74d77731e0ed 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -7,5 +7,5 @@ EBUILD CGI-4.220.0.ebuild 900 BLAKE2B 7b56b7573430032cf543b9b3ea9851586709a3d922
 EBUILD CGI-4.250.0.ebuild 885 BLAKE2B 04faa79cc01a9ccf6072e8d2092bd261e0ce0615d19a8864163b4e455d2ec7bfb8ae00c7c3ab4bde54e654f15ab2ce383c0550e53681c7fe7774a3103c029f52 SHA512 b4d754b7041861de1180af4b709826767f379f09ffacba66e74ad325948c4f038b145f9d086aef15168c987d5400241497cc4e38f2a8d43e9c7117d8b1e876fc
 EBUILD CGI-4.310.0.ebuild 999 BLAKE2B 7a9755e03cc2bbceebfc95091aa7cb54d1a53fdd3def93bae892c169c96eded682030aa65277cd4901a9906198eed6b505edf797249a2bf1886d2039e04bbfee SHA512 657643f73f33b147ab837510be0e9b2cde127450eff20449d84823d8eb47e492bd13c62ef055bf364b2f255f6bbe65c9772f61d64f27b6d7e3e4da829f27fc98
 EBUILD CGI-4.330.0.ebuild 999 BLAKE2B ca6fcc42fe526fcc5927347eafacdd2efe484a61d5bb1e39c38f4d7c8e142264ed4c4fe452658d28c6aa07835e9fe137110c57148196da7f6cf800586475ddab SHA512 f7d912af07cb23b71be21e5f5957d45368949c670f5a52d76efcebd205ccf5337108f900828d125a5772847231b38ba692ae36f2d73dc7c25b23607a87708559
-EBUILD CGI-4.360.0.ebuild 1035 BLAKE2B 7d31eb67889038b83200d580ef0d22ccff635d75859b43a8eaf89fcbe1c664a684946dcfb461e440fcfa3082ec6abd2b7be8fc066aaecf15950d4736e6dfba40 SHA512 61975b2d7b100fc4de3c996002f0c8cde1e69136d808a30440f7beee120cfed450dcdbeff54dd746e2268ba1ad8393bf1f30b012b8e0e6c4e28f7cad34e163ac
+EBUILD CGI-4.360.0.ebuild 1032 BLAKE2B add6b2b71d3c6a368917b8d24cf6dcf4deafa2844c88307c54cb3073c9906b248e58aa608c30ac65a1fed419f9d395f5e82257b10660708e8566f665c74b4bac SHA512 f0f6949f06e48245119fd0f418b35b0769fdfe63004f91dcc03b75976867421820294b6906e5a39ccbbeac8345e2cdab410bc400cdbb841dfa7be83bc7d007ad
 MISC metadata.xml 906 BLAKE2B dfdc7b33ffc98d0b9322c6682e0ff42ccb21f7cc52f5bf1f30e14284bd598bb02c1a63af712c20880d391f756855d31a77b21e6c37f35716fcda5d74cec8dff3 SHA512 89ff442464fb49a81c17538be8756521ce901bfdffc7e72b8ddaf56b00bbda42e1b9dd779c7e975986a930662ef1e3e57bfee10f51aef656db48e2a573ea04ec
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
index 7d98e59da24e..4793d9f0e021 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.14.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Verify requirements in a CPAN::Meta object"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 # CPAN::Meta::Prereqs -> perl-CPAN-Meta
diff --git a/dev-perl/CPAN-Meta-Check/Manifest b/dev-perl/CPAN-Meta-Check/Manifest
index 58c256a1d468..dfdb3a5a6016 100644
--- a/dev-perl/CPAN-Meta-Check/Manifest
+++ b/dev-perl/CPAN-Meta-Check/Manifest
@@ -3,5 +3,5 @@ DIST CPAN-Meta-Check-0.013.tar.gz 12555 BLAKE2B 148a66ee49cce352eba1dce4d1c89af6
 DIST CPAN-Meta-Check-0.014.tar.gz 13187 BLAKE2B 49e21dd269265f6ce279fe88430d9eb3b7bcd65e932da18eb7b6e762a69c20683279c9413157b8df432c480a8950097ee288013e648e062fe55280088276a48c SHA512 a10af09a7ce771ca3983adea8053d141750fd09849609a28e7f973831fd3a3ece55281841aec93c099154bb59135986da4983bf612ae4e956c45dbb3f2770f5e
 EBUILD CPAN-Meta-Check-0.12.0.ebuild 689 BLAKE2B e097aa599bfb586ace96085dc013b58ed1d470a89dde65112b544ad8797a81c40f0da626164a7a90c86a403f1ebaab2c9ff7b4e0ef3047b197141bcea1ddadee SHA512 677d0e297415b32fbe022551a9896ea1045487c3d2de69998dd583df274395e1e7bce3eb3f42aa206a656c9df2b94a3c76bc79c0f056c2bdecf4b7949d8b087a
 EBUILD CPAN-Meta-Check-0.13.0.ebuild 700 BLAKE2B 30c36158c24e96f6e0266d25f4e5704ff4b34f727294fc8c764d481e86a82759097f3bee00519f8b39794e16af6a1286348c643ed54e215ff1a7703dbdabb975 SHA512 62854ca1a2d9aaaf9529176476f503b8465296c31e6480076723c544278f4c3bda143b10f0d9e1edf488830b6e155de45c81f6e90401c33bca39ee92acf8699a
-EBUILD CPAN-Meta-Check-0.14.0.ebuild 684 BLAKE2B 5fd09e5fdb0d7b11c9cc6a4ee457bccad5a8e9faae4a4710084651f29cb1fa8d49e7ba07ac3aeacf76ff3a4ca59f9b3b9a9b270d224ec05b97d10389a1c47b2c SHA512 80522638404ccd7ede065ac0c2a3a1f73c61c64476ba07168b363f14fceabd833902540d904b6881b51d045d752963eb5b5f2f743d9bf0ade36fcc68405dfcfa
+EBUILD CPAN-Meta-Check-0.14.0.ebuild 682 BLAKE2B 83d04ba8dfd0a3b3b4f62575c57318bdf483ecf1275bbaa1ca498ce2f677abe959aeeb277508108a4c44b65cc1e1bb6d1c0c57930b941adfafb633d916764757 SHA512 bd5184dd9a4e2cf5926c30736da8492d443bb6b18091102738c5f50ebb53ae0d8b13cf54ed542d810127228c0b43ba0aaf8063870569656eca5378fbed276f47
 MISC metadata.xml 391 BLAKE2B 5d0a2b94e3a37af2aa336e3f7ae1455eb85d7dd575c91ab8617d950cf6b21a2f77ccad678e3d5630b5902321e23837d8584af1886985c138b4c6101efb30e580 SHA512 bc37f7b063ddb1b27a00462f8273c2b3e6324f06f6d852a64a939e377206fbe36e0b9be1a3778283092a16ad016cccd1af59bdf33dc3c029fea5ba320ca8c8cb
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
index edd951c0648e..063e789865e8 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2012.0.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Canary-Stability/Manifest b/dev-perl/Canary-Stability/Manifest
index 81529e0d3f2d..533dd8deb5f6 100644
--- a/dev-perl/Canary-Stability/Manifest
+++ b/dev-perl/Canary-Stability/Manifest
@@ -3,5 +3,5 @@ DIST Canary-Stability-2011.tar.gz 4265 BLAKE2B 0335a822a0ca8dd00a9b7ae179df127ba
 DIST Canary-Stability-2012.tar.gz 4334 BLAKE2B 47849a31c9ed3cddfde379b7a66c557b575235b30d8d55e5893b724e28ebb8f7c4bfac89f57e50ca09385d0535edbe46cfb4e0ee1afb32b3b60b9e9e7bcacd57 SHA512 7780731e4142d536182e1820c041c43ae67c5b47c044f15d8dcc060646bbab10a974bddcb703fdb27f427db3cd4dbdff54e131dc708c0260d7275be869eb27b1
 EBUILD Canary-Stability-2006.ebuild 417 BLAKE2B 77bfe4ab50265d1b258edd9ba6d22b99e5e8337b72c9a1cb5ef6e412b2a98db632328b8f5d9fd886dacf144783e9608df934b5c9320b042d2d7ebaef8772f7ff SHA512 ee6e5cdfafacc7cdfbe98a4c8e7fe32714d37332ad394ee3009a147eed799900c4016f169bbb74c8c4ad03c392d43a72b3cd5f51f446959e00485e68162fce56
 EBUILD Canary-Stability-2011.0.0.ebuild 404 BLAKE2B 615f8195796d62a18caad7d19cb3477544b573245dc8584c34e998520570c23b3a39b4d11622830d09432181d21897570a0a819488fb494029e97e7b605e6f07 SHA512 20efbf9ed04bf670e59ea799e7a460ba7d665ff8e41e247fcb7979da039648c3bc48e9e4c22a9e51cf14a926483a2ffdc161e1159201d5ef3a7d38b21cc6b0bb
-EBUILD Canary-Stability-2012.0.0.ebuild 565 BLAKE2B 15389bbaf55e9b84ae08a587d03264dfc4b0402eba485fc6598365afa13729773a8e9576c5a83efb53b038e1a98d95ce9b6399b3b987dbd025e88de94165989f SHA512 a1698f251615934653d14555a4d8651056f0bdfc39bdf566c6d50d549edd878852f57ea9505c0e234929ef7e6cf148273020f2c26a73cdf5ceeda756e0fdfaa9
+EBUILD Canary-Stability-2012.0.0.ebuild 562 BLAKE2B e3b7d648905e065ee33a1464783b291d2c8f81cbd71a804d13eafb2d12b1ed3a52f047a2aa412cd5cb9a6340945517bd56ae769452aaf8d9dd17fc48c5713bb0 SHA512 894fe0223fc603125f9b999869082c06c0ae5dff9c38b97c0c437a51c27fc3591dfd85e8b0b18b099df30b2d07fd1be0557c27b863b076bb93f60caab964ffee
 MISC metadata.xml 404 BLAKE2B b029dd8a9e04ac39ab7917ae1dfc108d9ec9d2f37fc9fc92f75c41bd2d42e44b7ed81b8d479c15e83cada7318c0cccd1c2e84da998d3cf720622d80268f37a6d SHA512 7d0c59169af0804ccc6e9f690c509b1894dc60d055f0536986053e1059fdcce831e7d3f8327ed3f3315c1b8a7d5df089cbfdc335fb61709c53867d14b55c6012
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
index fad1168824fa..001b2f38c10b 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Capture-Tiny/Manifest b/dev-perl/Capture-Tiny/Manifest
index c0d1862f2d8c..f3b8bdbed9b0 100644
--- a/dev-perl/Capture-Tiny/Manifest
+++ b/dev-perl/Capture-Tiny/Manifest
@@ -3,5 +3,5 @@ DIST Capture-Tiny-0.42.tar.gz 36671 BLAKE2B 02bb515244d1a9d278b5ac506e2807764e67
 DIST Capture-Tiny-0.46.tar.gz 37424 BLAKE2B cfc9a208c488072972567ccc1fc3956fad32e3061d7dec5ad953d0e6d90b5b523ee57eb9ae43c883fbf6ccd82b859327d9346f2f3e849054dde656c066f84f11 SHA512 6247bff20b95628453a1bfbfc6fb59c6a3967506ea45e01327d0978f48ae75b597c27c828ef10ae5e55be217e3bd0b63419523de6a81c97fabc8cf4e2a0e6cd1
 EBUILD Capture-Tiny-0.360.0.ebuild 675 BLAKE2B a8a35ddcdcab947d407786ea46c46333811c6e3523ed697874eac4d2b73dca31c6573f5ba95f825ffbf18195898ffb950c7824130aa51701529ec657c08b985d SHA512 4f1d004d8db52456467aca7d7594f051c32239a6fee0ecb2fa7b806403951cb72c2d594029cd346377f6a9bdc9e1668acbce6c23bdba00a1f208ffc0a1d57154
 EBUILD Capture-Tiny-0.420.0.ebuild 809 BLAKE2B 33cc15772af0aa622e38f02d06fa5a32b82f61573a79bc85f2dbae85c140421ffe186c2f8089399f9973425e6368576c26818c4fccf1c582eec45abefcc91089 SHA512 42136648fa3d60b18e094670c4096a4585c6e69bdb32e4771dc51fd5e5647528b0992d25d8206606404b663813c0c980688ed288dbb04ffe9f86365fadda9b3e
-EBUILD Capture-Tiny-0.460.0.ebuild 806 BLAKE2B 3fcdcae79cbe21adbeb1d7b9e3a98bae9f18e610c7b0a87bb4172d33d5946186f41530d1d9aa3403e47e27e7f18f93ef49c36fdeffdd8913c5f24582ac1cde3b SHA512 2fb86c4ac96bda3177939808b7635bc06971bdf53d49467221bcdcc059416f61bb4dbe0163ccf94f19501e475b5f99be2006f532c1e5d179de09245a26d937f4
+EBUILD Capture-Tiny-0.460.0.ebuild 803 BLAKE2B ce54d2b7e66f53b28b6d7b2ccc3ac78c31b9a0e8939941df1d38a448e65276bb11b115271b178af520f48d0b21cf43c424c9b43a16b490907a0a73688ab4e1c4 SHA512 cdaf59573f679d8e5e822898966e4715c933d778f599012a09c967f3b215466c144ab25a893d38003adc11cfa3800532070f0a7069d7b6a9a23c9582477652c1
 MISC metadata.xml 396 BLAKE2B f21556c36cc152b1db1fa5521a4733cd9d4b790f4af2011968f43bf27e3d146c4b83757f8fe9b9003eec6cc800d271da5303d0a318d2948f05a0fcadc7bdd077 SHA512 30de10bc3d78d68fa2bf7165525c2a84a79db417decebf19c3d5c8e54beae0749bb9894a476025848ddb7e66307bc570787a775c59b90ad513558b6348b8d644
diff --git a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
index ed6e9c73c3cf..e1685301d12e 100644
--- a/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
+++ b/dev-perl/Carp-Assert-More/Carp-Assert-More-1.160.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="convenience wrappers around Carp::Assert"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Carp-Assert-More/Manifest b/dev-perl/Carp-Assert-More/Manifest
index e7f832f1c75a..855a0c335a0c 100644
--- a/dev-perl/Carp-Assert-More/Manifest
+++ b/dev-perl/Carp-Assert-More/Manifest
@@ -1,5 +1,5 @@
 DIST Carp-Assert-More-1.14.tar.gz 10304 BLAKE2B 8fb42bd9c90632666d6b3c27a3fa32779ba2ab0c3aa9c992fb57ed8fc28155088fb803112f4fda95f69306164c3293246f07f168402b538eb291103e2d6a4994 SHA512 0411908afd5cc45cedce83fb10e67f78f7513fa788421d9c4e0f0f0064bf6fdd7154c2414a449456ff4c600f31eba138fb4d3f94e68743af4b71f7368c30b398
 DIST Carp-Assert-More-1.16.tar.gz 12290 BLAKE2B 818badbd216e70813993ea859796a16c531c767211ed6b294fab870dd342117b5445db73601f4fc955ec907d1340bfce6f17a784580bac8823a9d72153af38ea SHA512 9f81604574eab5a0a5003ad747ffec3a3dd33bc63e67d12697e4e30de8cb234a73e225f82a4d0f31576e19382cc2d6a402962f5fe1e4c5289e080ca23b30c0fe
 EBUILD Carp-Assert-More-1.140.0.ebuild 474 BLAKE2B 9287831875c963788e933c0adc3b46561207ecef013ad0656b4c5eaceb1cf93d8e12515bee378c07d0fb4c124a57d91fb48a8b28655ce51583fbab2d5b1d90c0 SHA512 014e9667d6006de36708c1f1e458bca60853712b8590838042728cbdb57e370c1a23938415d3b4d43ee9c5e59bd4533260738be64ddbe079240caae638346bbf
-EBUILD Carp-Assert-More-1.160.0.ebuild 727 BLAKE2B 486ebcf9de05a867b3f5c95300d367274810899de96bd5526c387c8a84f495fb32ee27ac77d2aab1b275198ef665d0108aeead90c5938025e63e4bcf39970469 SHA512 58af863a88160981b62100a896550f3c7f9dc966a96b683ef8393501d273263f10021fd9cee62bf588392ce7e898437fd2f5d306ac2955b27efcffe3b28ce8e5
+EBUILD Carp-Assert-More-1.160.0.ebuild 726 BLAKE2B cec525047ec7a97e071544f2c6b35e9e402c8cdc02eb146d3dd9b2ceddfccc12698a6ed1f743450a18f27b2916da55d3f2c7bcdc840191068a279b082ebfe15b SHA512 78bb6b238aa939955f1fd247bafa4af4af43aa6b935f4dbf63a5511104639309550f098476523f12cd2554979bfc1aa1c37cb8d91f75ea104a4358fef8625579
 MISC metadata.xml 405 BLAKE2B d8ca44fe4df62b0f030d968ea7835b52f9bd1dd0fe2409c0555fad6f1574c872dd2815a87f6c238ba2d7f4dd2ee3ff7fa712177b919b2d5dee3091a6d2871f42 SHA512 ea517d0eb9c3a7b9100622391d5a6ad41f3da6a019a612ba03ce6d850c229d41a41f53c7c0e59c06b80c145c0fbbdf597d5dbe803fab77271671ca3bed5b4889
diff --git a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild
index 9e29ed3c3ac8..b6b54bef96e8 100644
--- a/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild
+++ b/dev-perl/Chatbot-Eliza/Chatbot-Eliza-1.80.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A clone of the classic Eliza program"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Chatbot-Eliza/Manifest b/dev-perl/Chatbot-Eliza/Manifest
index 01f27bd3726d..dbf94c10ebf8 100644
--- a/dev-perl/Chatbot-Eliza/Manifest
+++ b/dev-perl/Chatbot-Eliza/Manifest
@@ -3,5 +3,5 @@ DIST Chatbot-Eliza-1.07.tar.gz 40241 BLAKE2B e0fb454498f6be1019b4aa173ff3a6476ab
 DIST Chatbot-Eliza-1.08.tar.gz 40294 BLAKE2B 74c84eec13daecab44d15d2d8a27c9c08f1ac590948e9e89842df3cf77f28c3abb7c00b6763f563f54063c4151e9ca22a044411276424b980d6ecc0041b92334 SHA512 9d90fc0064541167c85491e03bb8a8d8bee16986cd7a07a1e1ff99d4e80bb854e1d87869b9bb2f6b33de5c84bf479aa95a045a234317226f53f490eebde506d0
 EBUILD Chatbot-Eliza-1.60.0.ebuild 420 BLAKE2B 41fa9d9f65944277d5e11ce434f2cafabff52ae62fbed7246a59866f3b6cd916b8a728f7ab7f88845e3e8e73eb5952aba3c1df90a7c1600a52ecf3d37d2acfa8 SHA512 75a7cbb2bb73332c3917dd81962138e6d165c06bc3cc0855f26feb5b9ed868abb0b245b893c068ad6f72ffa73f680092cbff8d6fc7fca8e8febd47c735e8b6ae
 EBUILD Chatbot-Eliza-1.70.0.ebuild 455 BLAKE2B 4fc754550c61a8be89f57b0b8efdfdf2c8ee1632fa44c2afc6cf2937a67664a11748cf7af5fd2c3f3f59178a808b7b53147e76d3b75d75e8ae655d50085bc656 SHA512 87e9f2147040f22dee865f46f0b1b4436543119f67b1248cf327ea7b028bd3583707c9a9b98c30ae2568e0a475021d67f3270ebf2254905f7b0ea28e3ed0055f
-EBUILD Chatbot-Eliza-1.80.0.ebuild 452 BLAKE2B 2846e6ebaf97427e8472123b9a66f7efa5c1e75c7a101e843ed44583637adc675486bc6040afbc9f5740d9b84e30c050b27932b912384ec25298b2d4d18098d7 SHA512 d232ec98cf098e1ecdb1012ea83b8919a33f4e27ca6a6fcbca04b62de40f7b56c3e581a5cd9f72fe0ba3e68925776949fae13cc2e15e9b6a18b453a665782f80
+EBUILD Chatbot-Eliza-1.80.0.ebuild 450 BLAKE2B 8d69faa24b148826b2f2e8a1693626786818fc62c08b039836121e6a83b108b377fadbb45fc61cf466ea9984a453d107e537e9654ba9dcdaab793dc2390f822d SHA512 5d15febafa48f396b9c74a2bf5fe32a597471d0f8df80edf39e2bd8607e0dced96b830823ff680aa19a1eb1bb89bfb6eb586acf27bd04feed927414495f19504
 MISC metadata.xml 398 BLAKE2B d9d0d0cb695a82e0fab3a8ecc42f4dc2b5bbf5fbf76dfe1dbcdea8171a10eee3f143462056a84465c143c434b24f32346fa0fe96d2ebba922d1ce499fa702d23 SHA512 8ab3f01035b2ea469482eae738b58f8056262c6efde00c889a387b7299b153d8088ec450512b30d5d537312780423f46f3e44f3d70d39817261e64293b8285b6
diff --git a/dev-perl/Class-C3/Class-C3-0.330.0.ebuild b/dev-perl/Class-C3/Class-C3-0.330.0.ebuild
index 383765c62513..1c0339aaa862 100644
--- a/dev-perl/Class-C3/Class-C3-0.330.0.ebuild
+++ b/dev-perl/Class-C3/Class-C3-0.330.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A pragma to use the C3 method resolution order algortihm"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-C3/Manifest b/dev-perl/Class-C3/Manifest
index 841470a5edf5..1ce9b74d88cf 100644
--- a/dev-perl/Class-C3/Manifest
+++ b/dev-perl/Class-C3/Manifest
@@ -1,5 +1,5 @@
 DIST Class-C3-0.31.tar.gz 27257 BLAKE2B 87a3e583dbc04893c8691236b0c7ef1e5d0630aab7732b426e4244a2871601f2e11919e1669e584656e58bd7e7c20e353a9b154029e52c36ff91247f359b0c9f SHA512 f299e69e6ecfb51536babe89994a66e44179583c1e43cb79e23072f82db35ca3d2cabbc8119bdd59ed7d2119337ada79e55338a6d7b8509a40ea7896cd7f6173
 DIST Class-C3-0.33.tar.gz 27163 BLAKE2B 81f970446076796e05412bb300170dcc65fec20b9f10bb112e412be1019eba4af16ec3276af20c6432862a835b48ebab976d4d4ca3b1410af049036fd6aa3639 SHA512 f72cff75c1222d7b42041b44b5ec7c8ff79e8c53f84ff11e1976a69dcde49093c52e66ebc19ce72f70c99332a9528a07a7d9eab7c74f5b6ce77464434b36cd7b
 EBUILD Class-C3-0.310.0.ebuild 538 BLAKE2B a21eb09608b643969a38854067f5d2a4b26affd564c3edf17b4496e62a60f1c5acb74985b33260c0123aebe31d4d795d193e84ee72c8085dce0363296751d7f4 SHA512 aabd460666aed235f22fb2bc4eaa4ac0697f65eac5b20bde8464e100ef635acdb9edd88971efb387b6cc698057d75f9119bdb5a43a90e55d0026968324ff51b6
-EBUILD Class-C3-0.330.0.ebuild 542 BLAKE2B d1357be03a93879f9be0995d2c540f076134ad776c032361c63c8cadb865df7fffe8b42fa063c246dc380d97a00dae0c65e4177e6aac1a42e492cce3c4ac709b SHA512 d4d7f3a9be96d115d42b83f37cf6e3c65fc362d60338d8233c36f8cc146d17d8e4592459d2e1201d114f7a0166988741abeba913d92f4da7bd87c68508f97017
+EBUILD Class-C3-0.330.0.ebuild 539 BLAKE2B 0a687207589c04b78e61553b35b3a99daec21da70f0773f8284aff3f85832acf207d3eeb9aa6c7c93253cc4e383543c98a95237f6df9945c4feb86ea56656efd SHA512 a591eebc418349acbe957300ec55df72b8c5bab369b7e90f7532fb0f2ea1913d75752da7f1b832b2f94e11d144707ad4b6480005f90d7c946d7da446240a41f4
 MISC metadata.xml 388 BLAKE2B 1c59b1518ce173ef5a65e4a3ca2a64e99641e5ac2144145b5bddd1dd7a9777c781f342026403134f94e327800c533ed28e2e682abde3f51f9d795ecc3d01087c SHA512 0db92077a577defa73274a14e149a03e3a27bb1cfa4f06fd595a870e1348c2343d615ca4f250325cd21b912e62ece370a8dc511fd50eff64e185166d3884d33e
diff --git a/dev-perl/Class-Container/Class-Container-0.120.0-r2.ebuild b/dev-perl/Class-Container/Class-Container-0.120.0-r2.ebuild
index f80f75a3308f..bfe283db1447 100644
--- a/dev-perl/Class-Container/Class-Container-0.120.0-r2.ebuild
+++ b/dev-perl/Class-Container/Class-Container-0.120.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Glue object frameworks together transparently"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Params-Validate-0.24-r1
diff --git a/dev-perl/Class-Container/Manifest b/dev-perl/Class-Container/Manifest
index e66d632f68e6..8dcccd15a75a 100644
--- a/dev-perl/Class-Container/Manifest
+++ b/dev-perl/Class-Container/Manifest
@@ -1,5 +1,5 @@
 AUX Class-Container-0.120.0-dot-inc.patch 1132 BLAKE2B 9ba783e37a17dc171b017b9f36613fb559a5698caa6d4f4e0920ee470f52bc550b8cdfa86dba9f378938bf0fabb41b6de9a834b581c998566e317c9dfecc3bf0 SHA512 1bf4f3594f71069e6e094a8423228e06366ff13b6727804875228d0023ecc09a9e57d406bc2efde9f6bdbe3beef6831a5c140d570ce75d7cee7b3594da14622c
 DIST Class-Container-0.12.tar.gz 19401 BLAKE2B 67cdb657fe28eef84c2bad95cf6fdb8cbe5d3d6e5199582cf13ec0f07a26390ef3ea0007472412b9bbd9d9b875ac9c3db234c025e237413769308a4f01663fed SHA512 7342154422de316c10fbc78d894e999dbcd8097f67fe9a5aafcf27a407c08988dde8d42dac89f535140c44a52892435da15c77fb43a1d7c3558d273e00244720
 EBUILD Class-Container-0.120.0-r1.ebuild 422 BLAKE2B 66bcacc14740a7873236841abcd0aa0694ecd7052793a214d36dba1e24161c378c20a5c3eacc99901d795231c75d05009ef9b916f88d0a2c946a9153e099b511 SHA512 fa17b07d6dcb7fad4c65bf058647e16a45e4bb2e778833c02522e9066946a73534f3510341b96532c7dd8aabc42a64ca79c9ad3fe3e9769dba989cee73071e80
-EBUILD Class-Container-0.120.0-r2.ebuild 480 BLAKE2B bf1b9cdc5a1fb96a049a58e1176b000140283489aecc877a824f7f031fb8bdc743cf08feb1cba85f77e9a06f7c116d509470af24edfc5a05240fa85cfa236476 SHA512 6707d63bc9ac6a7319f0c4167af6e224839c224a4bf04714b3948f53d0a442833b4abd4f0bf0ef0634f9e8f123d3cd8ba6e055b7d31f722246e89c5cf354fefa
+EBUILD Class-Container-0.120.0-r2.ebuild 478 BLAKE2B 285cfb5d7765f84ae4a08f1638e55897f8a3cf51fa38b124bc48b81f00d6d1b36b32a6d43afee1c6ad1cc8f8c5bf147fb632dbfd64c9f865c5d098a675266b71 SHA512 194e1f5c5d8fa66ff20aa14789816d3b380e26673477fd70cc1f7b690dd6216d60ae258a359c67f6f6d6defed979faf6464c49fdd5ae748f530beb7ec6de0abf
 MISC metadata.xml 402 BLAKE2B a9fb03d73b539c9f53936d055ccb910c8a30080ff569173639388cbb039af8860606f8b6ec53e08b39d7566954a521fa5177ebd5628ea04764787035bc31efb0 SHA512 b0d4b816a724f2275a48202eab83ebb634f85bc5a0b131941f58eda638769875835c46bc5f72cd5784b8c6dd4e1c6a5ea810feb2db1071c39c8ffe54f868f5c3
diff --git a/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild b/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild
index b5921e585c80..d3329cbf8443 100644
--- a/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild
+++ b/dev-perl/Class-DBI/Class-DBI-3.0.17-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Simple Database Abstraction"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-solaris"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Class-Data-Inheritable-0.20.0
diff --git a/dev-perl/Class-DBI/Manifest b/dev-perl/Class-DBI/Manifest
index 52adf57d07b7..8f4a55695adb 100644
--- a/dev-perl/Class-DBI/Manifest
+++ b/dev-perl/Class-DBI/Manifest
@@ -1,4 +1,4 @@
 DIST Class-DBI-v3.0.17.tar.gz 105416 BLAKE2B e02c373b5e9fe2a315588dc6b9353bf35b1fd1dee3489785ae4cbe215d9a1137376f7f958e2ebcf50346de0423d4d40474e1460dd55b255d9ad1077e8a63a54b SHA512 006bc6ca754d24d9cb3791fa99128df597be1f96cb62c309a0f37f169e02e2baec6aa7e6395ddea8202df11488a9db52fa817d8fff7f925097769d70356d1fe7
 EBUILD Class-DBI-3.0.17-r1.ebuild 739 BLAKE2B a85b964b9752c773594b2132cc85e57cec86a03fa3ab4c718897c15c6bc44016dd3700cbcd9a255d8a4ea323fc9db8514f9dd53b7fe0dbdf5c7a13f7fa3c399f SHA512 3675f9a35e21eb17dbdfa3338b818949b43b1bd5c999ea3d5f0c514e0439386dd11d3ec94cb3f846de1ed6c39616f2dba38ffa2c323496fb511e7fdab9635551
-EBUILD Class-DBI-3.0.17-r2.ebuild 920 BLAKE2B 193ede7fb66c22c2781d595d1e7be88d93b41fd87cb97a456767adcc2d7c216739317815277d5e4629134734bfe598249fe2c5d50a70dd1310243fb46ea065cb SHA512 227fe675be54335bfead8a930dab85c40aba64e288561b904a44e0bcb88a94541ff1b988af0c5d7b89aa5a3220c76ce99748534399f18a936ff734b4e3b1bdd4
+EBUILD Class-DBI-3.0.17-r2.ebuild 919 BLAKE2B a01ccd3dbb77475210e029bffe295bdab71eb2ab30a529384df3f95b865b3ad54b2caebe5b5a57ca6d1b0bc6b3ec9eab6c84a66c4b6a78b6af1a5a470d40dcf1 SHA512 f118d5de21bc19023f6bcfd099a339e6b63093901f36a637fd3c3ba15bae97da50c089e975aeba4b27cb7fc3eaa5c92fdea4a6dedf097e4e56e0112aa13444bd
 MISC metadata.xml 1609 BLAKE2B b06dd01624ec75b27e1fc6f0d7562b4a00ab3b44f5f2e3a9c26d1c9ed806b9fd845dcf4146f67fd83d9b51e7626d1604115ec943d35b3febd2bb92bc654b7f85 SHA512 ccf159b9fed1789fc0a5098b0b85311c397b41f2181918567540198a81f2dc200b8a4dca4c72ec048b7cc37b7013b76ec0aeca7c895b95d1acb9d374d5597b33
diff --git a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
index 86cb5d1af981..f307c204b5cd 100644
--- a/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
+++ b/dev-perl/Class-Data-Inheritable/Class-Data-Inheritable-0.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Inheritable, overridable class data"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 export OPTIMIZE="${CFLAGS}"
diff --git a/dev-perl/Class-Data-Inheritable/Manifest b/dev-perl/Class-Data-Inheritable/Manifest
index 8f095d3f021c..46074c15be6c 100644
--- a/dev-perl/Class-Data-Inheritable/Manifest
+++ b/dev-perl/Class-Data-Inheritable/Manifest
@@ -1,4 +1,4 @@
 DIST Class-Data-Inheritable-0.08.tar.gz 5660 BLAKE2B 258e9d143b157b97995ace7236fbe12600d3de2c4301c6996ef66ac96c3d5f685224a0846fa0a52449e5c080dbaadc29ab9838037285ace5a6217bd69bb7ccd7 SHA512 bddc61096158b21d4cfa69538d5db0f53617a66c71447ee193141064f4f58194462b21e0a849510e24e4c263b13be3ee1bc6bb8504320e0a86c02b67ad1652c8
 EBUILD Class-Data-Inheritable-0.80.0-r1.ebuild 442 BLAKE2B 0e9db52087b2e8b0640cde6a5cdd10d11197b3efdc95882c75980cd873e0f49518dac22e8d3187517f503d6b6039efcb308c437f30a4c852f93294f6d71b12d4 SHA512 f0ee4aace4d2129e9bffc3ba11dce7e3ae6739390f6e40394f81b40e534eba15c6a055068ff05a70f9ac69cebcba23c7d9cdd535cd0d908aa15fe3a718797907
-EBUILD Class-Data-Inheritable-0.80.0-r2.ebuild 522 BLAKE2B 1dfac15458116da7438fdb8b6161a14c3bf326f3c99d921b3face129b795c2ecabd55afc2d8c66def50e1ca39350a2d80fb44f4f477c0df9a95c557985cc4df4 SHA512 5f07feba80c79e4b6e2701a232949ad2eecf89084b9a06bff125f2c503ff47e5b9fab2394b988578c3547d891725ca249cd2bddb329763469a2d216b99495260
+EBUILD Class-Data-Inheritable-0.80.0-r2.ebuild 519 BLAKE2B cc7d95884076c56e506ca54a0ce005fa7acd8e779aed6c1d2c40a13c87974efe7afaf182363fd3aafacf98e092850732d3f881f33f07cb3269d835e8fe1822f2 SHA512 3c0f5380af0c5a864f700f12df4aec2de8b5c1dec9d1169e27d629f07759076c948f98c8da11b902cef308030aca517c4db7d35d268e3566360d9826c59eccff
 MISC metadata.xml 417 BLAKE2B a334b2837319a552aca138c2753b1b05256065c8470303f5400def6e499c80050a48640662fc78e8a194b11885bfce1715087b1b1e474e3b9f6ee6d09361988d SHA512 731a05fbcfc0746dad0d75e62c9dda05bafc73f33425761087beb269e32508c7a6c3c881f764dfb2fee84c95c095325e33965bf2448ee181e26f7478daafa6c2
diff --git a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild
index 3eff97b5fdc0..e49cc5870801 100644
--- a/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild
+++ b/dev-perl/Class-ErrorHandler/Class-ErrorHandler-0.40.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Automated accessor generation"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Class-ErrorHandler/Manifest b/dev-perl/Class-ErrorHandler/Manifest
index 95eb579c3723..dd9d68733083 100644
--- a/dev-perl/Class-ErrorHandler/Manifest
+++ b/dev-perl/Class-ErrorHandler/Manifest
@@ -1,5 +1,5 @@
 DIST Class-ErrorHandler-0.03.tar.gz 10061 BLAKE2B f0b1f7dc2046ffa2e9fac321d96979f66594c4e766f56bf4d33f40eb004915b974bb1117fac159acc4d2d2470132227cb11a619f9ebb97eb596e48a358b7e792 SHA512 aefc6497b8ebdd3efe1643a84051b2739879f5472753a484b8eb14a29ba1826806bdc17ddb46efb50e969ceedae309fe7cfa965d9c45054b40fe2fbaed7b60a7
 DIST Class-ErrorHandler-0.04.tar.gz 9821 BLAKE2B f92318211d23b42652eee40aaf538567f0047daeb8b7b5bc80c91759c5e103314ca3bf712524ffe66897873e10b689be13ce10ad0a83604743c3dc927d24f320 SHA512 9e235da1c2091f9422723af4528305b8ed2b50920a865e6fee76380a8c512fcd837d752f4ea5146df12c506c776e88c1075419ab3809be3296995387df759c83
 EBUILD Class-ErrorHandler-0.30.0.ebuild 537 BLAKE2B a8f39fceabbab6e933ce269e031b9530c30a23476bd77d6aa27d0e8aafe381612bd8cf90f035d37f88873d8353df06e58de48513ea616a2f1a9846f7be33d35b SHA512 1c6bd1420179cd79ff75965b1afba6838ef6983daa0788e2f3e5d438af6f85b1beaf713e7c00ebcdaf75ce11ad0f8d4f76ede775e9f7ece1e87f93c7a51872cf
-EBUILD Class-ErrorHandler-0.40.0.ebuild 415 BLAKE2B a59f3ba249522bf1f10cb7a557ae5b14c6824987bd991b204fe9f7cdc7d69458aa09900b703e5a226b72c8e5d833b9b03c9bd6e28d8947c0b92653f7c164e78d SHA512 d2a17678e45e819ef01a34a51f056c41d8d4eaf89504afb4dc42476dc2a255547d0cd77036708a31102c0e58fc4149a0d3ed3fdfd32425fa948e1545c54b4dbb
+EBUILD Class-ErrorHandler-0.40.0.ebuild 413 BLAKE2B a5017c4f79a2a397448e5c5b93a5cf471af35e5818040ab5fb1e1ed2500a026e7902687580c28ebb49f42ca6c2992498dfec2c5da6bf1b9907f0c543eba18130 SHA512 95d47d1683c608769a38d8a9f22bf9410ad10c255843858770753f01f60ac30c7f5d16ae1eed40c34482310fda52b85bcc52604c426817b0eac6efd1db2cf161
 MISC metadata.xml 408 BLAKE2B 36d5c4990de8021e9defe7a9eade1d436aa52bfd170d3b483c7790df137914da164059d99a83ddf786de576d792fa463e10f28a411d4910c0a5b6713abf20221 SHA512 9de334b02d65bc445a6100a73e07af85356c79c10e0f82db6eef52d7d5fd2780743dc21355401f4ebd2692bc5174cd9144a922b9dcbd2f0ee77b7eba93bb407f
diff --git a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
index 2115db9ca446..11e854ca0cb4 100644
--- a/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
+++ b/dev-perl/Class-Factory-Util/Class-Factory-Util-1.700.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provide utility methods for factory classes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-perl/Class-Factory-Util/Manifest b/dev-perl/Class-Factory-Util/Manifest
index c86f0ae7d74d..d1e2b38445a7 100644
--- a/dev-perl/Class-Factory-Util/Manifest
+++ b/dev-perl/Class-Factory-Util/Manifest
@@ -1,4 +1,4 @@
 DIST Class-Factory-Util-1.7.tar.gz 11942 BLAKE2B 1274784f799ed9960d54443837277712093f64e7ec4b1c07ff88861c1a28e7138ed8c1ad529d871f66a2c839925b980638fda03fa932f5be9eb183ee0046d431 SHA512 8b8af36f1100805a9f59bd8745bc41455ebc20af9ff9cedd8a36370f66e0fb63a761918ae4f268d5546aeeecdd4ca7de448aca36e84f27b8f0932f34db68982e
 EBUILD Class-Factory-Util-1.700.0-r1.ebuild 408 BLAKE2B 2be26dd5690ed6614ea63ace88649b531aeafdfc73a14e6254a001881be35614d0c53b821a14072b09cceead6e44ab13f42f29dd9921c7d4724915110c77e5be SHA512 071b8a8f6727c56d86dfefc0011956f578d0d37184811b0e6a8756dfcd97420af2712d6c4e4aa0b93c6e2862ccd823f161e74668e760063b87c7031d85c2ad37
-EBUILD Class-Factory-Util-1.700.0-r2.ebuild 487 BLAKE2B 68a52333660939c96af22ed29a79fc1fede1a8b58209a8a0702bdddebf3ba12709c2d150ef2bbc90efc9baaa2d04c433e5bb6b179df45d24f5cd30cd83629891 SHA512 36c59bfd520264cb5a0ce00907e7bb96d493d1da8ebca843f8a89ecc40a7538c86625eb76e532925c2482a2522a367a4e127e4346e18cf16b2ed1720307e3bda
+EBUILD Class-Factory-Util-1.700.0-r2.ebuild 485 BLAKE2B 5663f87d9bdd225a137ea37facd177b355732cb61d1a4b2b4a13cae5441f2dfd27c1b0faf882c8279d6ca8f381d233071cae51753fd6de4644234ded123aa907 SHA512 0dfa04323be7da7e0093622a6f1b6c049d64c44f7e9b3d088f22eb35b8b48851794b65ae59ad496638159926a3ef109dee4262cbda776612fbaf5cb9740cc3c0
 MISC metadata.xml 409 BLAKE2B e4aa0751ce234742c3586b0c3121cb89fd9e3a08f336103a430ed6d780d5035cf9ebc8bf8529f54362d4ba9176df33abf41152394ddf77c9d1472698bdaa5834 SHA512 fcb4fe11754eb35fdf09fbf5a1196edd6d6a71dec92158cf1d98b99769a0854c1d2f5c45e4f87d1efed0a40723eee78c85692923e6bcd2e8be58bb4a72b835b3
diff --git a/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild b/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild
index e519f9923bd1..fd9828af3250 100644
--- a/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild
+++ b/dev-perl/Class-ISA/Class-ISA-0.360.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Report the search path thru an ISA tree"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="virtual/perl-if"
diff --git a/dev-perl/Class-ISA/Manifest b/dev-perl/Class-ISA/Manifest
index 67a0ff5fc9b9..5619fdb41626 100644
--- a/dev-perl/Class-ISA/Manifest
+++ b/dev-perl/Class-ISA/Manifest
@@ -1,4 +1,4 @@
 DIST Class-ISA-0.36.tar.gz 6056 BLAKE2B 5b5bab6cbede8a5871daa25e988605325f4affcf481b64eb801f950ab72531999af12a2414fc52432de406fce9003c5922cb65ba2df38cb573d40ed5cc1dc9a7 SHA512 49171bc0f78bd8aa74271d2f9eb1f2e535e69c6774f47557b07df011c9b8f44f960ec3c162acd256218944e866666731af27520d1e66cf560f065995b7658416
 EBUILD Class-ISA-0.36-r1.ebuild 308 BLAKE2B 3d24856e48780c0d985df9301800955cc6b1ce4a25de4951fc43d25a1f219837af7402c61a8c1ae6f3cf298f96daea6b291401292236d86ed45174e1730222f0 SHA512 21e1e916145f0e1428d067bf1af2a2d4b5055ada0962bfec8ccc0d5b22ffd7dbb532e591ab236acf1160837a22a950f68c10ee0216c5662ca9e49bfeca6c768e
-EBUILD Class-ISA-0.360.0.ebuild 427 BLAKE2B 7aab03dc536e0891ac16e63fcce68dcfe18bc47054225c92cdf3f6b2467b5006cc39be60011831b9a6ee11f08af5d7a94dc71e40a1ed22ba44fee3d44db2c40b SHA512 3030e0ea9e67e46c4bb09c64ab71a09542ebc7913ded670bb1dea6b86364d753125bf076edccbebffcbe38a89c8c46e1b9b35def7c49658d39a12b30802a7f40
+EBUILD Class-ISA-0.360.0.ebuild 424 BLAKE2B b384afe1550fbbd1b4a88d94b69d1adb746793dde261d5f6b244d9cfe506f2eb97ca7c816914e7b3ef98d427f80e5e4609295626b17e6751c39c6b38e961fe7e SHA512 e2267ab5a71d1045a8c058499b825aa8f4a984dfe4ae1c323b383ee4090a5c6a0025a3bf544c77ec8f2e207699b6a63eb99c31d13941e96c3543331f0ae5466f
 MISC metadata.xml 390 BLAKE2B 4254b92f2a63efa84f08390d4454a3ee97cef3f7457f5230108c659f89838b826db7499301f6f876538a2ccfcd19424a9640b47d647f056b07365845b9ea8808 SHA512 9922b35061271516fc096e7f31db12ba12861dc58fedd5e3c4b70d67a3c3a18975e62381808e32c7f772be5167532c531039c7164a8152b783c67c62e903ef75
diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
index d3c12374f379..37a7688a257c 100644
--- a/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
+++ b/dev-perl/Class-Inspector/Class-Inspector-1.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Provides information about Classes"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Class-Inspector/Manifest b/dev-perl/Class-Inspector/Manifest
index 861229e2b505..a29276205c2c 100644
--- a/dev-perl/Class-Inspector/Manifest
+++ b/dev-perl/Class-Inspector/Manifest
@@ -1,5 +1,5 @@
 DIST Class-Inspector-1.31.tar.gz 24422 BLAKE2B e4625e914be6d6ae581feb4c943adfe51795af266735b63d227ebb9be275c8cc19bad3bbf39769c306eb9ee25980ae40198a601a83d6feff613a7f1f4c86f6e6 SHA512 5ae8fa38d145d351b00b316853428f1ff7cf4dfb19952ccaa10e64fb84b41fc45d2510ef941347785b1c44ef2a1f5d4a361d321e2c0a6ee4b08232f6bc8e2d2a
 DIST Class-Inspector-1.32.tar.gz 25639 BLAKE2B 3bb007f076db85ed05476c29bc5fcd38570dff4e9eb7d2e309646635cbd0c53468fd201ac3f1db501fe9a92c62f9bf882214a0f441a9b0d14ade5966bbee3ac6 SHA512 980654614d968e2fb61df864322f5c5248e352f0697a425539600c3549505f47b857d7856bc9d406ebc8757f8fc379a669f1f5085412f6fa48672c9db8a82df4
 EBUILD Class-Inspector-1.310.0.ebuild 557 BLAKE2B 5efe22d96af4e63ed73a0b9faf04622f0721b316f9a2457e4ca29a795805c74643e9bebad4eed523f2efc1b370f94dcd1e8ae9f4712a5c4c38c18cf1b842b0a6 SHA512 996458224966760fd1115cba57aae21ec402c3694d47c4293fc154ae6d8b1151361e35911e629ff3672e5eb6ec1d049d9dcb6c93a505a8a966092df1cf9a3155
-EBUILD Class-Inspector-1.320.0.ebuild 563 BLAKE2B 79783662d1a229a3f2abad9dc7225dbcb28b8968c7988dbcc1d261deb4eebdfc5b0d286c5d057218a8868d300da5c7944c792a34514810d8914f7cfbc1618cc1 SHA512 9ab0c2b62eb6f0982745c89e74493922b2a89c60407aac5f8591a5c8ca6a917cc33a4cba4395ed1c20c287f59877e23eb292b67b156a50d575022390d9d87ce1
+EBUILD Class-Inspector-1.320.0.ebuild 560 BLAKE2B 7f1e65ee1c1586e2bbc755655e4228456caf2e9eaa0c7fedf85478ef7acd03b02b9da627b22c2ba11f44a8b82f65db4eb5c9511fee286bffccc129e8a703b4b1 SHA512 bb9d9f64503dbe0e576e453a0b0c052937282a39a686a71b927ad60c31bc080f78c5dd746a8504117c41e8eca221f84178fa216891bce9ecef0e28845f3aeca0
 MISC metadata.xml 476 BLAKE2B 9a23e31d5863e4d6a3fc21f2d4802167f6b64877168116c45d78383be45ab9b47a3c31bba71804d375c022edc881aea98c1c85ef6ecd7f020ce542991a506100 SHA512 b10c02eb3589b01fae51383dde5dca831bc56cb65afdced92104ab9597379734b129c0f0b0c8172a61a79f150ed4af6db6c8eed8d4b5164592a36f7414ffea4b
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
index fb0c867b6600..32dc9366a25b 100644
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Class-Load-XS/Manifest b/dev-perl/Class-Load-XS/Manifest
index 58e4eee9f425..dece90fe9ad6 100644
--- a/dev-perl/Class-Load-XS/Manifest
+++ b/dev-perl/Class-Load-XS/Manifest
@@ -1,7 +1,7 @@
 DIST Class-Load-XS-0.06.tar.gz 56141 BLAKE2B e3612af5f8741a4766df09fb2488cec5df80b242d05d40435d9b537acf7af87f5043263de3a2efa85464df5493d6dda6f72faf15317657adc349a202dc4f6a21 SHA512 07effa62cef0c27f25c5918e7dbc9aec3aa2ad88dfd06963cef2908c562532ea3048feb97717f0a120ca40250f3629f31a2d9d2263036e6de61158bebb6afe36
 DIST Class-Load-XS-0.09.tar.gz 73186 BLAKE2B bda5f8541aa2dbb31effcc415377a23924ed42264bd3a937eb7103df41a17f6fa9165e39b90c96a40cac70ffbd805b920b3d30714e6ec926b4e6d216c229f7f8 SHA512 9b24637cf7b035ba369f05e42c0bd5a8590e001f2395b46df078635a50bb3df58ad57850be0010d092ae2530d9a545bbcc5f0055f6ae7f166c93905c022d469d
 DIST Class-Load-XS-0.10.tar.gz 77930 BLAKE2B 8d7540797a11fadf5f1d3622df0f39a1a8e97ec35aff807c04e55bfaf3ae3438c0cf777bfae8a39b44b4948b42fd05f8dbf476617b3321a1dee2149bd013a4b9 SHA512 16ab845dc393567f0b0e9597eda7d7678b8a41d218823a166bacdfd4dc93e704a6aff98662340b8d7f4d045a60530071bb84ea8da8be5a6930af47722207d126
-EBUILD Class-Load-XS-0.100.0.ebuild 678 BLAKE2B dad8ff7f83589063392001a4355662498c40722dcdc8f6e029b479be7e03a5e08dab22b7adb9bab949af748b3b4e726064fa9120755aef6b1d3b4af4a13ea604 SHA512 95009d74f5405ec968ebb4f04e7008c91f09872e98914aecf6c3df81050c3ff5e62d36387b1c997917a90b030da70059744104e501ab9546236d11f941acbc21
+EBUILD Class-Load-XS-0.100.0.ebuild 676 BLAKE2B 2638ea99f00f201ba6332d33cd03b1f0f2245cc15f374da16e487831932d42c2559e49702ce635225c17b8a41574057a0b842ac03bb4c4e6cba24020357c0cf6 SHA512 92e0ee865e9267973befc5fef7b12305a683fffb8688fbd0c03933c3a70964489a6f2262f9704cf99cbe5c2cdcf52ddc33a2521caa7792034c756b17ca5e9e69
 EBUILD Class-Load-XS-0.60.0-r1.ebuild 592 BLAKE2B 3b129bf02a9e5a754cf9f6f1bd6525c9b78e8119e1ba811a462649eaffec50f56bb22d7fc077dd80551c13218c3647dcae4bcc0abc426301da9c8ae52309e576 SHA512 7042e9973d380adf1898aa280704ee863c6dbd6b6a8cf47e3b3b129fcf012949e0c7aa5be8cf9e196304791b120d9cc80b5ea472065465ea875b04f4af3261d1
 EBUILD Class-Load-XS-0.90.0.ebuild 683 BLAKE2B 2607492e63b6df8a944616238f74d88690d9f2ac311fe709f13b35fb935e4761ddde2f3a3850dfdede448a0858ae19abbe2dc1ce6500a54a85b83f570b407f4b SHA512 59d04a171af9484035e5f99205cbecbe09d447fe49b7600a01e56750e01c732af300152f0f0253c0e8a25c8f6e8a3bf76337b59e93261207f9c6361ad6fabbd8
 MISC metadata.xml 399 BLAKE2B ef94714122ef8479e4215abb0c2d74375aac887916bec428aa07c3ae4065323babaa9507012f8615428b370d5d0c9a9e960696c392a651c883daf0e9bc423163 SHA512 ffc09edf2364b43dd67a63c088f9cfbe6bc3c29d603eb6328f04574b0f98e8f08baf635530f483883f5e0940cedd5e04ae113077b23c90b78fb61a8a3c7bc74b
diff --git a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
index 883db6cecf91..9302436900cd 100644
--- a/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
+++ b/dev-perl/Class-Load/Class-Load-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A working (require q{Class::Name}) and more"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 # uses Scalar-Util
diff --git a/dev-perl/Class-Load/Manifest b/dev-perl/Class-Load/Manifest
index 9791530cdfd0..42e1bd07c35e 100644
--- a/dev-perl/Class-Load/Manifest
+++ b/dev-perl/Class-Load/Manifest
@@ -3,5 +3,5 @@ DIST Class-Load-0.23.tar.gz 33610 BLAKE2B 3ecbd6c3604cdd0cb36bb2b3e59e65fd889f16
 DIST Class-Load-0.24.tar.gz 35412 BLAKE2B da000f18dc81641c28027bfaafd3cbea758356c5e2af5204c9b818b51fd51239432793a0b26605d0cce70af03ef28bbcf87b50b6cb9056a38cc04feb05adcc08 SHA512 42459727fc622334336aedaa49e3dfd1aa92103c838a33b30ac61d9d9fe74512f7b1012b3c20fd1c4eaab1456545feab4d9d22b91162ecddd4683defc1b987eb
 EBUILD Class-Load-0.200.0-r1.ebuild 738 BLAKE2B 6c8e4247f57a3a82f285d00b292dc5cf49271c8ea18689d8a66cc8c46f7a0e0233fb8ed61e72c25dbea30b798565f997708d4801ffcf1770c7cb9911572b397c SHA512 8bb55d7d235f4aaadb49c9dcc3dd694a3b1a033f0413b2d5cf5782d7320a2b2f56280ff130fca88de12661f0ee62c42b6cf74d19fea548249a35a79f48edd378
 EBUILD Class-Load-0.230.0.ebuild 770 BLAKE2B aa4e1ed7748d444f2b7e5f2ed1cb04c0efc063243608822a22a9087ee0d285686544ae63eea5ac7d21ed9163a0f3988179d0a4deff645f95c9ae480e383759dd SHA512 326413cd5cb5d1d8733cdc5a1d4d276a547cc967b010ac4e0f8e85364b36b87ffd2d2471feee4951a1e943032fb13c6df93b9ea54f703e81fc84b92d917ad8fd
-EBUILD Class-Load-0.240.0.ebuild 849 BLAKE2B cbd0617f45fef5994daffe012064c324afef296e2d65dc0a05d97081582a0cac2cd074e8fd175dfdbbbf282827ef79e9419cd5c4bf1ff8666e1ab460e1c0591b SHA512 bd188403f11f51a7c6f264fc11db17e4fc93ddfd98ca4e00eb1ce4516adac12da490ef80734da74def60d2869c3164c62a78ecce3c5652044f9791aeabe83f7b
+EBUILD Class-Load-0.240.0.ebuild 845 BLAKE2B 819f2fb1558779e5d36b642059bb196c7f6f1da2fd21d5ff9bd78eb5361c860b9342ec78a37bea88b1b13a5be9265ee0a872089f574feacee7432309c7d03403 SHA512 2680a84714ae94c8a359ea99649bfe007e17d01f00a1c0d241abada4e17f6fcf162a501d50a886391a88699de5f74041486facca09df30914873634b1f77a7cd
 MISC metadata.xml 454 BLAKE2B a8c1f1b0738e85d0218338cd8071dbf11200543a85b0f5d5f69366ec6fba26b71aeba8642a7debfe3ccb3cec7e4ca0fe6c76da0cabc87d2b17961e61daebcee1 SHA512 78f2ae47292344dd9fb0f705dbfb639eea1be39fcebe1018645f5b598561756a26afbcb862651d62add961948a379df59391f94e22a2fc69952bbdaa641ceb2d
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild
index 3f6de0d0818f..e026c56155c7 100644
--- a/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild
+++ b/dev-perl/Class-Virtual/Class-Virtual-0.80.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Base class for virtual base classes"
 
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86 ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86 ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-perl/Class-Data-Inheritable-0.20.0
diff --git a/dev-perl/Class-Virtual/Manifest b/dev-perl/Class-Virtual/Manifest
index 49fd9a6e368a..e4150e56e9f0 100644
--- a/dev-perl/Class-Virtual/Manifest
+++ b/dev-perl/Class-Virtual/Manifest
@@ -3,5 +3,5 @@ DIST Class-Virtual-0.07.tar.gz 6357 BLAKE2B 542170f05ff5a385d1ff8de82c1d4b6d603b
 DIST Class-Virtual-0.08.tar.gz 6864 BLAKE2B 7b74d55a38bf1122f336d3a32d352ba04d24552f0b9fd58f0537edd895b2bc6c39fbec45dda96f87084907a5cf3e5502f6d509a90a3939ab39f4f546ed7368ec SHA512 43a95d1339724b9b6392ab7c13eba502938cfee9ad29eaeaae0dc84549f29ecc700af38a7f04bbd357fc76c30b878532c919edc69bc986d791556eea46ef4439
 EBUILD Class-Virtual-0.60.0-r1.ebuild 418 BLAKE2B 0d6609ade27684747561ff0441055b024d51e24bc702fc195c3f0cb03b70e0ec1b38d3c509b6f3eab9f44bea2a568c9fe2959b5dea4bae920099db7e0a4e28a7 SHA512 007c6b84f8a0798f172792dbb50e9b0b83e74e7a253b3c8ad19cdddb71f0bfe07f2018ed4e09aba7453b619dbb5672cbf6e575bce810e48447360ad9cf06100f
 EBUILD Class-Virtual-0.70.0.ebuild 503 BLAKE2B 97f9fcedc0efe84e6bd5c8b396478f06741722cd4c6393158ec0ecebf9f068e3e2bb37c4d8f3bb738c7075e42025077f5e1cee67f43f2bb9e5b0d72b06ce3ab9 SHA512 05c1006544edfa68ebdb23d308a200971ffe92b73c4a12039fec75b351b66139eb2c9334a6c2a3b39cc78c6dd34b9abeeaddeff525a375c0fb46add40b4d319e
-EBUILD Class-Virtual-0.80.0.ebuild 501 BLAKE2B 5b998243a0ec2df94f606738776560cf26b533190532fd3162aae352630dbdc84e5d4df8e1f409a5d4126835dfa043607de51fb88008777be929654de36f18fb SHA512 b756f3de800508d652f0ee6d88ea9642250a625e0248efad45193a2c84585d1c4cde51e877fc6e39e28bd64a5c2e6b1fe57e96bc12951856327f5b3680fbc8de
+EBUILD Class-Virtual-0.80.0.ebuild 500 BLAKE2B 5e67f19e2d6bea5ce5baac482462c1a1cdbb0486e84e3e7d5b1a0f65fcffb74eed0a907b7dc2075ed359b1e71bb684b3905bf2774dee199afffb9795599df1bd SHA512 fac5e9af4d42edd6f35df1d2bc06dda13ec9acc945ab1a8b5c548afd1d13833487b979248b9466d2d2debfeb5ab4a42455f94b8af8d4a87d79ed3c3061d08384
 MISC metadata.xml 471 BLAKE2B 58ceb3010610e3abe3297d665c96b2222c347271dc13ab598a6dd928a8952959601f04c5cd0446c61f614284128abacbfc4f9b4f8d19a0384c58ed94f7deef69 SHA512 3838f4b709138dc3d40c63b2f07238debcfc1be681b358f957a78e5ae98a3788c58e7b88e3dea93044f129f150e9ecd7911bb8db8bd9218e0a512f0e23a43bb9
diff --git a/dev-perl/Clipboard/Clipboard-0.130.0-r3.ebuild b/dev-perl/Clipboard/Clipboard-0.130.0-r3.ebuild
index c7ae41f674fc..fcd6e6131cde 100644
--- a/dev-perl/Clipboard/Clipboard-0.130.0-r3.ebuild
+++ b/dev-perl/Clipboard/Clipboard-0.130.0-r3.ebuild
@@ -10,7 +10,7 @@ inherit perl-module virtualx
 DESCRIPTION="Copy and paste with any OS"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 # See bug 521890.
diff --git a/dev-perl/Clipboard/Manifest b/dev-perl/Clipboard/Manifest
index 9126b69ef228..843e2dba5737 100644
--- a/dev-perl/Clipboard/Manifest
+++ b/dev-perl/Clipboard/Manifest
@@ -2,5 +2,5 @@ AUX Clipboard-0.130.0-insecure-tempfile.patch 655 BLAKE2B 4051298d2779e7f8350136
 AUX Clipboard-0.130.0-no-dot-inc.patch 1186 BLAKE2B 698830824a23a0dac1b40b43cd77b184352ec3fdc171134efed30225512a8f2b54e0d4584f20f527f6075205f294609d25a8093d4fca592aea8c4e699c4877f7 SHA512 cc6e24586323b90ce64513ea5a81e64f1c9f5f06390cd2dd4d2f3bc24e82c107cf9c03e637b614068d07597f3ca49cacd51bc168089506ab2bdbdc0410129c2b
 DIST Clipboard-0.13.tar.gz 21616 BLAKE2B 6e46f36fcfbcbd61ca35dddb85b16da49ee7b2d6f3e0cf6b15e90a5730b649d0bb960108c33d6896903570f3baaf5ce871511dfd3a1330625b9974190fb408bc SHA512 29792efabee3bdbd808c445714f344608f79799561029d3311b3c263e7bd52ddd8be6e17773f2e027b0d38afecd5d7057af3a129e053c1c01928cf2c5a12bd6b
 EBUILD Clipboard-0.130.0-r2.ebuild 566 BLAKE2B fbb07dde45d8660bff77cf36f3daf86c082bec5ad6fd75af723d7a53dff41ccd644602fe19489f21e985c1ac6b60c2416017defd932dd966ee61c6dc2b1b4b69 SHA512 c2292a4d2249bd93f9403d8a855d18bb6e164eb8baa70591b2157c9e8fbd0812428f68f6d2f5761c0e9a670d92a2a89b2fbe3fe33f48fcbdce909a75b206d0fe
-EBUILD Clipboard-0.130.0-r3.ebuild 464 BLAKE2B 1311ab59a1d419d9445f68ddd877c54b05bd2fb1baecf0fe51fc7037978a268a2ada56282c470e86f3f6d4047a98b27a601e674b4464c86aff93a4c23940ce4c SHA512 5f4d19a09d6aeee5938cb52cd4beb71a9004baf89443bb4720c2989e728b1de1954164e36f2c7a594961f83c0cc73150356ded012a750cf3367b5939bd90b599
+EBUILD Clipboard-0.130.0-r3.ebuild 462 BLAKE2B 1313b9e2b3d03262615d730ad9b792a37325cdef1e1b442168d08ade7b7cc42157dc573ad74411f372c68b7aab1bedfeeb19b1d5e8f1555a8a11645b2f5ede02 SHA512 8ac6703f63c413269979b52a5db8942f4ad0cd99791a0fd17e6cf323b6da972b9d598f5a1117aebc0af51044f6fa0219a2ebf7ce7d272be385ef9083b0b84215
 MISC metadata.xml 647 BLAKE2B 035eff8bc4070bc851c89442f2175379af802e68b566f7ae29d9df31a49e50a64143724bb1b6814d81ab8ff72b45f004840bd3bdea59dbca9d3b9618602f948a SHA512 dff9edef9bca1249129e68f2c2d3d582d39c3c753b00a5c664cee0f0b8080038e72ec4e81d5e77245a4c0fdc912c074e03f4602dc1de196db0763dce14ba3e72
diff --git a/dev-perl/Config-Any/Config-Any-0.320.0.ebuild b/dev-perl/Config-Any/Config-Any-0.320.0.ebuild
index 3a633cb2be0e..51d9aae2a512 100644
--- a/dev-perl/Config-Any/Config-Any-0.320.0.ebuild
+++ b/dev-perl/Config-Any/Config-Any-0.320.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Load configuration from different file formats, transparently"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~ppc-aix"
+KEYWORDS="amd64 ~arm ppc x86 ~ppc-aix"
 IUSE="test +conf +ini +json +xml +yaml"
 
 RDEPEND="
diff --git a/dev-perl/Config-Any/Manifest b/dev-perl/Config-Any/Manifest
index 69ff02027e56..b01464ef9a2d 100644
--- a/dev-perl/Config-Any/Manifest
+++ b/dev-perl/Config-Any/Manifest
@@ -3,5 +3,5 @@ DIST Config-Any-0.30.tar.gz 20026 BLAKE2B e43a98fdf15f81b250282eb065ce541b04414b
 DIST Config-Any-0.32.tar.gz 21045 BLAKE2B d3eb7df6ea972bdad2ff416adb3f6744ab972520bcef0b116bd29249416bd4184935d92752f4b1aec371656462db08e87ba9de78f7cf36c53d9425673f083ad0 SHA512 7c6fa9f341b1392ffd71babca688e3fb8bcd5f6330fe15aefb36ac002af83ed3674667dcddd9a500404bc4e019609f392c173653a8a792267fdb609e9323116c
 EBUILD Config-Any-0.290.0.ebuild 840 BLAKE2B c353609434ca89d1ba548b69691b505cf1ebcfede4efd401665141cd192525c0c4aebeb1fe331d4fe019203e9ebc277205b593b562ea20c267ff08d20671818b SHA512 b143e28c4dd15557e87198768bc9c55ee19ad82bd2bc7bbc11f6fe291af382b8aa142e5048ab538531e9f45cfea8a5336755f287e4698c40226269064195af84
 EBUILD Config-Any-0.300.0.ebuild 871 BLAKE2B 65769956afcce6ce02b099e3b1f442143fa37124baad30f3a061ca508bf7107152b46eb43c6f70f4c91aa60928b31627da327d4e560195fcbd86661ba61f1799 SHA512 b983f045579d3171081fa6e66970f1fab1caef1639a8ea1f89433405cc04ce583250af6b0b108092c82736b2afe351aba15916b376cd431b00898531d538578e
-EBUILD Config-Any-0.320.0.ebuild 951 BLAKE2B 052bc01b84fa843572cb584fb73cdf66ea2b7c7e1e4cb5a436c0c539bd317cad5821c3e9f4bee74a59f1597e6a1b16a1356d37fc9a3552ae4dd337900e4e0163 SHA512 df061767375f0898719aae0bc81cbd4b2c9e6786a95c72e2be2b3e5d986f89b90d5556d073417d1986eec91ea55230fddd94fa859ea7f47a05687655cecd1712
+EBUILD Config-Any-0.320.0.ebuild 950 BLAKE2B d6644978020ac6754a79fa007b4a93ed31c33485041071ad24ba95339bb6da1ad195eb8e2b2f60eb506ca2b3cfb6c13fb8cd7ccea1c8c557db8343befd3905f9 SHA512 702503b36a8029db2fac9dfd3539d15e47f0e3b19761bc52917b8c86fd73a1e627f574b06b852c539c3a03708bd4eb3fbd2043099345153773f12276cc5e9a08
 MISC metadata.xml 1349 BLAKE2B f46fca28d8d481ab064d59479e71fce7648365751d4ad21a299e5c85ea92249ab384032fe2c51d486fdc195a9fe88668ef4fa0ebe532f2789162366a88d37851 SHA512 92d6cb02cc9162dce60c150374dc0987aa48d2a73d53487ca9efa8fe4cdb6b80c52797ce16fb6576bd680ea059c29ace9825d7880a371ad2c0dd95e4f61fdba2
diff --git a/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild b/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
index 21d02d3adbf2..346c905d25fe 100644
--- a/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
+++ b/dev-perl/Config-IniFiles/Config-IniFiles-2.940.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A module for reading .ini-style configuration files"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="test"
 
 # needs List::Util and Scalar::Util
diff --git a/dev-perl/Config-IniFiles/Manifest b/dev-perl/Config-IniFiles/Manifest
index ca0c5a1c175e..f04671d00c3a 100644
--- a/dev-perl/Config-IniFiles/Manifest
+++ b/dev-perl/Config-IniFiles/Manifest
@@ -3,5 +3,5 @@ DIST Config-IniFiles-2.92.tar.gz 64569 BLAKE2B 5e7fb2fb12d56e1424bd69f04598cf003
 DIST Config-IniFiles-2.94.tar.gz 65322 BLAKE2B ae3271acf5ebea9f479fa9142c0931192134ea0d25d361c2a0caa90b7ad95234983d6b4469ab73d302bda7ce2a719374b593233de728e5428511675fe3766eba SHA512 9ca9950f31a00bde580dc73b5120971070aa053f36f9a0ee29532b17b9a070de8ad3184631427ad442dbcbe087a9680366849b5e10f264e20694ddade7e3ca7c
 EBUILD Config-IniFiles-2.880.0.ebuild 688 BLAKE2B 5495989daad06023e769f345956cbab0a00d5ead94fc2235d289be09b9e673a9d7d68f348888d86bd15dcbbe53989fbca3ddfdb8228c3f7b35c45ca50a857507 SHA512 f54015daccefebb21b819cd2ff3fb478566a0c90681a0dcbf03f8892a17c10ef405639a7b3844d01898d82b825577f64372a3d04e8b9776c32be4c19672ae1a8
 EBUILD Config-IniFiles-2.920.0.ebuild 853 BLAKE2B d616f73e1cfbdb9ba89144454980784f53b2ae00416d38c9cbf345b3db4c41151dbdc3aa2a95ef13e2412b3105f8e58355fb366f9b850b380c903cf212b77f77 SHA512 7d7cae77d900132ff28162d43aaa439c87a0ccefb613d2770a306cd27ad63d328dcab2f38b375991f635418cc7f818343861c38723243b63e9550383b573ec12
-EBUILD Config-IniFiles-2.940.0.ebuild 851 BLAKE2B 831803561ad12fd06ed001ab02b921e942fa47f21b528248d89f38764b68d9f831c73f6023b6a3ea500ca4934d980d4a4ad15234fa551b31a53f34990d62b46b SHA512 926ad4030ff45eb6f1205dec23788c30cfdf73a6bdbb3fb3e5277eddfe33bdc081b693a8a44132f06ab71204a496cfb357cb1164a6cc921441275c490ddea522
+EBUILD Config-IniFiles-2.940.0.ebuild 850 BLAKE2B a2ac9cfdbd89e69ad682c9b661b6b3882e56c451ec919eb5c699902e91c01d54c3486c3f51683743a54721bf76b37a904ee409dfd062043dc1d1d4c26a117927 SHA512 4ef7254c5af4be1465fe1138e3bc39b9389ddb7f7dc4cccb4c924f1a1ad8e680882826032d2a2c1e0592480c8dffb53103e3ec75fda543274ebd853dcb9510ef
 MISC metadata.xml 402 BLAKE2B 6632689946b6483d11bfcf66259edcc54bb677611013bca728bb800259b3805a270dcaae3eeb2094991461d56f6fab6be52e19638dee1adaa34a2f2e5c1c7f31 SHA512 13672b5157b7f35dc04937cb69ebad2a00cd15e5e0105e92ba61fd40abdb2df51264868c7d990a1c448920b040123130f05fd91dd0aef679a12b4d653282611d
diff --git a/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild b/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
index 5372f865dfe1..278e4d698f1e 100644
--- a/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
+++ b/dev-perl/ConfigReader/ConfigReader-0.500.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Read directives from a configuration file"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-makefile-tests.patch" )
diff --git a/dev-perl/ConfigReader/Manifest b/dev-perl/ConfigReader/Manifest
index 6462be141da2..4425e719af8c 100644
--- a/dev-perl/ConfigReader/Manifest
+++ b/dev-perl/ConfigReader/Manifest
@@ -1,5 +1,5 @@
 AUX ConfigReader-0.500.0-makefile-tests.patch 1527 BLAKE2B 2e3dba757e9143518312ddfcddb673f81827e353bfc92eb2a5489fcd0317f47ae50b671e1eb1bdb0c83176ffcc8e8c499d15437ee39dca27ee1a28f647bc7041 SHA512 f29fcf200d9134ff3f50a6f233df98a1f403bb63ccd37e4bf475196faa2d96f1e73fe9d04d032f2f04486edbde7c86ac9cbdecbc5a20d2c2ca63dd35e0000ed7
 DIST ConfigReader-0.5.tar.gz 17592 BLAKE2B 1232cb8ba6fa80f6b3ba7cc0ba477b83e57d5698b259db20482fbe39d36fab863f62ebeaf56a3196108bc873b0dd0410636962e692a2784a6fa346d93feaee3b SHA512 625c7ba506e7d501adf1fa22830b104e413f115c1e3758235d395fe2995e84abe92cfc5b13e0d23deb255e849c3a99ce56a8006c8b6a967d5d60598337aa303e
 EBUILD ConfigReader-0.500.0-r1.ebuild 496 BLAKE2B 00c75bc2e5b472833aa22cd6924cdcee274afb7fc731290903da7483391dc521a704dd6b11fdbac97907dfff5e647e938faf8c5cd02ba1bd219e3ae94ea01034 SHA512 a46786db9e8dcdc751664c9e1249e201d9771463f24ebc85b99ac32ca1cb4c6c24ea3f76e917fd69f1d3de67b1ccc27a2bd7328e12418f8129455bc5c5e79b89
-EBUILD ConfigReader-0.500.0-r2.ebuild 353 BLAKE2B 0f961851fa1d135413d3fb54cad7e276e4b54d58fd2f7d7035651b912a1aca24a71cf765480cc42fa929a8a4c7c486505db0c045d54f38d7a575ec86c90e4f00 SHA512 0be78ed288a0bc658e15a297bb3e8462dafa234570a83b152ab988cc96c3d09d0db5673278eab72b796f738f38611db0523e7f125761245300abcf9dd53b5233
+EBUILD ConfigReader-0.500.0-r2.ebuild 352 BLAKE2B 8f994dd2e7fca1e12acf37cdcca3e79f1f86f86ad8336b8c5a7a76c3044d144fe69696583e0f9a160e1610dc442e85224f0e14b5f2f0aeb8ee72a9dc9bc4e226 SHA512 f26b52f0fe2ec219b814b5b9baef020b63919169d5216c910ea60c6839622b38039101f51c277497ccb58fc5c2ea1e7e6f434e926b21672baae15d3cb545e881
 MISC metadata.xml 543 BLAKE2B 1f6524bfeefd8abe979dbbc4879040f27457e20e4c4f2fd6f328ad9aeae81a9a3c56c7bfd7eb08ae4156aa84cc13acfda871d558c2f9ef8f1e8fb4f5ce362912 SHA512 7e55b9a266ce8ca6708febe8d9560dc174e966ba99042bfbde3b6e7bd0a36f20944ad62ccc1aa6c74e021ca3738171344309ae9a9d01443e3ed0f2cda00fce07
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild
index 226797c1a49e..5b05dcfc392f 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.125.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Extract data from Macintosh BinHex files"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Convert-BinHex/Manifest b/dev-perl/Convert-BinHex/Manifest
index 9a4611a28074..ebd8d177048c 100644
--- a/dev-perl/Convert-BinHex/Manifest
+++ b/dev-perl/Convert-BinHex/Manifest
@@ -3,5 +3,5 @@ DIST Convert-BinHex-1.124.tar.gz 73095 BLAKE2B 0fcd28df06b3ee7a6e13bca44adcbd692
 DIST Convert-BinHex-1.125.tar.gz 73122 BLAKE2B 9f8731a3f258c747c909c3870b7738b4242f52b8181603693e99ba3680a154a185e9a694a0a762a75f96f9e5b3452798560a2c68e65155a0bc8c381d90312357 SHA512 c088feb0d9dd2c56d79e4fe21494e5957f763bfb4afbd0335ba099f4babbc7790951897730faf097d61ebca4a262f6676a9532d8861c2deca5a6d61ffdd6f115
 EBUILD Convert-BinHex-1.123.0-r1.ebuild 322 BLAKE2B 902588d0602a1081def1a751abf4bb7293976449d3b5037726a784b5219d6495dd319d98e37902811a662f04a97f34f7b9f3964668bc91e337ffac61a06a5212 SHA512 e43ab82c42f4ed84af2682502cb5094cd6d88c8e605918561e93f69ae94d9be8c68bb7a66cc08d02e71cec454c607b9cb9cf8ab614ad64809da75fc636725ae7
 EBUILD Convert-BinHex-1.124.0.ebuild 573 BLAKE2B 1b39217986a908d9dfa2539d6cd56d64952f55f8999aad051b49f4f066688782d749fcf070fc939c27a124f0bdf624ede77b665dbbf2a6f706bbdc9a0b34017c SHA512 2f82d2dc1b43af5555a9e5b47dcc9656228949588abbdfbbfa93933c4b98dbfde8bf109b099cd1f97e429bdaff422a095a5a7d2f62b5ae80d5bacc80199db1fc
-EBUILD Convert-BinHex-1.125.0.ebuild 550 BLAKE2B fe2eaacecf7d271f5b6a58ce491fb11bfc1fec4e9ae1c8597bb3a59556cd6387293211ef8a53dcc85cd6e8414015ffa352854b701ba3622489ac0af644570b8d SHA512 f39129d5b4459e4d801593eb472c8f1e73bd89010802f91829ef92407051a30e49dd04a12d4d4959eb2d4bfb7c1860c1baf1f44168e6b2912354721378fbb87b
+EBUILD Convert-BinHex-1.125.0.ebuild 547 BLAKE2B b4b9cfab769056c0a4cd1bc0e16e5856aeb6dd777cc09ada76409ac844318d982249cf862c294d69425cd96b21a16df2720df3c81750afba6f603d883377715a SHA512 b5dfd6ecec6b812bc375d0f71e89e286d6e575ea4323c7d5641c65770777f8aa113ae6af45518c6b14a3a729b6dd493f41ea938c9551ad9c123c8fba49451444
 MISC metadata.xml 756 BLAKE2B 2a8c787bf5ce152e87afbdf482c9bdb11663663ecfff9958c40e7a052dfa39909618a660bf8f36f0ae4f04a72c582cbef418feea0653e040b99f18c318a5a61e SHA512 29a822b5f013d269a45747f91cbe1f2753f0080c6c14db68c41f0f5b5be0db3bba03d149ac1965e4dc35b1dc8dca58d8af74965c51375f826e2c9f06fd43c2fe
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
index eab1d633e688..bd67340337a6 100644
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
+++ b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-3.23.900.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index 28078581618a..542224f7eca1 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -5,5 +5,5 @@ DIST Cpanel-JSON-XS-3.0239.tar.gz 219371 BLAKE2B b03ad479cc1171d0aba84f0ba221cac
 EBUILD Cpanel-JSON-XS-3.23.0.ebuild 470 BLAKE2B d7aed70ea20d500f5ded1a5a9bbbe46d26ff79c60ba0c6042d823f5b51af634861965d33d105b5d1241f9cf95c453fca7b79cc41ccd3a796f1d4fdb70f97736e SHA512 50fd97f5d88d300f2307935537fe8a9cd0c3b87eb32ad228ab52b7cd5da7563dc1a6554f09eda722e2b7e2444220a4d298fcaaffcbdd17b8f29d1164c2977d14
 EBUILD Cpanel-JSON-XS-3.23.100.ebuild 475 BLAKE2B 09df3a1899e07284039b200cf69788f3aa294cd751eb78a536875a76252274fec7a08ce0f46a5732fe1133ebeda644515f91b506ca4ca59187f04014c76a691f SHA512 144754512ba83537c1d197bd3d6cc80fd5d2cd8a64a2b8721d2d7e7d9a1e9357494a0f25db19c2dfc0471e6fcd732dcd47682ae9860f1b24789ffe188b5b6121
 EBUILD Cpanel-JSON-XS-3.23.300.ebuild 513 BLAKE2B 5823a967d55821e7274144d898f203cbd95bb9af2e7a171019cc7bf96467a4a146cdf861e3a0ef02895d17c3736d890eb17a7e6206cbd07e8f8d44f942ec1776 SHA512 c795ada8b7e070638776509a9725313e258fbf2118ca2c4bfac7e08337dfc64ad4cc6a09888c187cff37011954940b0b0dfa36ea4b7fcfc6e96d8764089cf292
-EBUILD Cpanel-JSON-XS-3.23.900.ebuild 523 BLAKE2B 921f0a859b286052a94c351a37bdf5c32593e8f7b40d1de6e0d481c333ba0e6aa3e4ec758c2d11a3c7e433d5587c75d6d65ee648ba4e58bfd700853c220921e1 SHA512 ea631f1e8d097667570fd23a6c319522d600185e1f76c39b892ee2b14e4d0efb9356d69e134f638a67bbd9390f816d1e054bb253cc0d615c7c1c02f009964cae
+EBUILD Cpanel-JSON-XS-3.23.900.ebuild 522 BLAKE2B 5fbfe81553b3b929b22052481e6b0fbd96b8ebdd5025a768df7e71d22d62041d1d5668334a6808fbb69cf230c50df3c8a5ccdc75a2e080fbb16d6d156820538f SHA512 d43e45b3fdb1aa508285b2adad96c1c92904a9bccd077a238bc4c8773041369d9b8b9057e711f7643b4cd58ead3be81ee72702863c983fd2c930f0bb5cc6b7bb
 MISC metadata.xml 401 BLAKE2B de5ee963566e3471500d6a481445c09715483b7bc913e5a1fbd139de0d3f34e986ceb4cf9966cdaae909027250b76c85f0ea8535ca02ce558b861e055371b05a SHA512 c1ab8b9c9957f6e48f83e6aa82ae0912f3a7db57e34f844b4c9e8c004bbe303e3ab4c5cc865bd9df3b9d5b818fdd2389820ae3ca98da56ee3216fedc8b10a771
diff --git a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
index 0c82a2331059..5dcc7c3393ba 100644
--- a/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
+++ b/dev-perl/Crypt-DES/Crypt-DES-2.70.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Perl DES encryption module"
 
 LICENSE="DES"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-perl/Crypt-CBC )"
diff --git a/dev-perl/Crypt-DES/Manifest b/dev-perl/Crypt-DES/Manifest
index 9312b2093d9e..cb377f3f878c 100644
--- a/dev-perl/Crypt-DES/Manifest
+++ b/dev-perl/Crypt-DES/Manifest
@@ -1,4 +1,4 @@
 DIST Crypt-DES-2.07.tar.gz 16720 BLAKE2B d90b919ab493a7f37cd1506b86c459d68087e0dd153e16d0343b8b90fb44d19f57686aacb1c0dd34a3bb48c2d11ae1f910e7e131a3b05b38781d54d2e4d2c05d SHA512 95d40280850290fb2f9b2f26be2f47f2241e0aeeb842bd02c56d667062d65b3b65b9a87c045cbee50604f95f8a0d0b033c92334520de19022decaf77f77c7678
-EBUILD Crypt-DES-2.70.0-r1.ebuild 466 BLAKE2B b5c046a8ed9d6e575c97188f1482f40c01f9e0c46a194ea35cdd24ba99a2e3a693caf541098454d70101f8e8aca1a0608094555f8391c64149a37a103b2b44a1 SHA512 721e6b485dcc948387be2606cd71595bcec138885abbd91b158b83f65cf980b0f42945b923b4cd390e4e52c70992e5f40f69e9ebbb90fada3608c08142e29f98
+EBUILD Crypt-DES-2.70.0-r1.ebuild 463 BLAKE2B d37335eac59c3c3c210d8615b7d3616f4c64a781d9a3365c6caa2cc6412bf8f81dee56fdf8b8ca3fcb47e912fa00982f9d24529230a17bba28ce1c486255cdf4 SHA512 0a724d89a8e8cd6d741b17af4ec865422ce58a4416eaa845918b756edec32ecce7d42f3dae72177d8195426b4f873b5275cfdfd99b9caadf537c4d8ee43fc8b6
 EBUILD Crypt-DES-2.70.0.ebuild 434 BLAKE2B 711b654034fc6c354de52610e9d2f2b46eb5d92a5b015e96c6e1eb1d269a707d27898587f53f5c82f15a9938212143cfc3417a60badd69c72dfe318d03a7c471 SHA512 1cb7c7774449f054d1a81c76ecba7e1d48ab4cfde70738878a533e20213aaec8d30896177b302348432f73ac0d555a27c8e376603ac467160a8f531e14340ca7
 MISC metadata.xml 390 BLAKE2B e0ed7568ad13c3f2d6a8cdbd8dbab2105b0f7e61c1494a81018b8ccee85aac9d308258564b133246dc0a071be9d940956d982a38723cae45e8ed7d229a05edce SHA512 3a19fdc685de7f63552843b4436bb4e0aeb722cae6dcd036a8009117883516a2ed4c506775cb15bdad9f66995e6faf88fc2fa835db846d41450f43fa8a7a80ba
diff --git a/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild
index 40e80d207c55..ec4fda513a43 100644
--- a/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild
+++ b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Diffie-Hellman key exchange system"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Crypt-DH/Manifest b/dev-perl/Crypt-DH/Manifest
index 2f207b563a10..e287f92fc87e 100644
--- a/dev-perl/Crypt-DH/Manifest
+++ b/dev-perl/Crypt-DH/Manifest
@@ -1,4 +1,4 @@
 DIST Crypt-DH-0.07.tar.gz 43736 BLAKE2B 6631f7610abd44d0f6c8816e1d200a19fcf0d16ea181c3d5d00077b886cbca1b42699e265f1ea9f0d4c414c003944e7d213e67b265007a411be8965d2982422e SHA512 60e58403e513535463290255989e9f2263107aeae6831d51d761e18527b1745baa45c16f655452fd618a0fb0e98413d5ed68f3926247ab2ad2da4032863b8ee7
 EBUILD Crypt-DH-0.70.0-r1.ebuild 595 BLAKE2B cb7cdce72d342abd255fe8334fe857e45171febcf9810cb84b4931b21c4413757d70f91d21f01c263bee764415715691c531d6d8423826562cf98d87dd8d5b87 SHA512 422c4d31508bf97404bc42dcbe4f1b2223c4c1454dc0290789d984d30a7165d345a7da68bad778c444791085bd9f924d1da4c025d9d841f76278f71d7b3ee644
-EBUILD Crypt-DH-0.70.0-r2.ebuild 594 BLAKE2B 47a310e12b4a38821c03cf02d6aa8bc27bdcad174e4bb2b60179a58ce06e5cbeede55de04cf9d4824a6c33dc59cbf917a4bf93b739483afafd8ce7c351444a46 SHA512 ef0e05f8573348bdd64384ed2bd6722934fd7a61a59ff248d19f6cd7678e09b8173867c793e63ef45877c8a833866a5105ef2b9be9b119322c08aa2813d090b1
+EBUILD Crypt-DH-0.70.0-r2.ebuild 592 BLAKE2B aeaec6b9a230da1c0b4391944a19c98b0c1f3f5c51f27d360b1e3dde94bd463efa03e59f9631e01a75fcf945819139ad922561c3fc16a4f5bc75111795466ed3 SHA512 b83ddaa211b0b68cc28f59672c2fd59effecaced3974b35fa78caffab8e49edbeb8dc989bbd8dccbc8291d1190dccbf17c4f31004d58246281523b89c0925561
 MISC metadata.xml 388 BLAKE2B fe470d47e938f185d64fcec1f3a92c140699fe51ba3c8c7d5f921c288db046401d84b88532c6b74038593d40c162df12ce2cd6be12650414ed957dc8fba0942c SHA512 ea3a7869d72be7c27bc9cd54738e6f752dff237016e9ad8a8bb5009cad4b5bb60d0a52e47be0405a6b74e9e0723a3ed1ef217af769ad6a9a9a50f17e3abcf34e
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
index 825deae22d91..0136c631c77f 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.110.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-OpenSSL-Random/Manifest b/dev-perl/Crypt-OpenSSL-Random/Manifest
index fd62a4ca3a4e..257ba22effdd 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Manifest
+++ b/dev-perl/Crypt-OpenSSL-Random/Manifest
@@ -1,5 +1,5 @@
 DIST Crypt-OpenSSL-Random-0.04.tar.gz 10679 BLAKE2B 6e8a30e72585046af00c094572af06a150c23569b4538b8d5caa7bfbc12eedcb21b83c2f5709955a49f67f726cf5a754f438288b3c61052b43ec3fc5b7247b63 SHA512 0c5121903dc16bb0ee7f0d6b9528ee43e68a47e1fd301d18fb70c02c9869a1fa7f03f5dd9cdb6ee3c005d8de123f6c1357b459c0dfecd28894874f946f885bea
 DIST Crypt-OpenSSL-Random-0.11.tar.gz 15161 BLAKE2B 33c491755f210514361f6d97715dee781a3f1b99879b2357002dc6dfc8e6c63df530cbcc1ceb8da407928aa531d0fbe85f43afab3d86995f0ade6c58f8bbd320 SHA512 c579cb2b586dbabd697a9c7c989a360ed4bd8e9b28d7c93ad99a86bd9bd680a89c3fa77f6315a1105fd41bfdfa18087ca4cd51fb320faad7a6be9b90e3e69b95
-EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 705 BLAKE2B c33a2d319a5e47f585c55b4e839fa59b0041d754e63e9834b60d3e24ad1028c48ff57c991915c9b50f2b16c4192a193f67ad184710532edece1427bb552e88ab SHA512 a3f17f2339f24dcdc5e2ebc35d391da3cf8043c827d6fcc60b8611a45189d3da5ecfe4b985dd2445cab69174aa658d4e15522e0bc41171671088b8e27c60d438
+EBUILD Crypt-OpenSSL-Random-0.110.0.ebuild 699 BLAKE2B 6c9a4c40c8ede5ad2bb00684a30c702e3065d7f1616fb537d67afbe3984ddea0675471099666090b170afcfd1d8e2fa1eaabebb110b1e149b0710953534982c5 SHA512 0f9511079ef8b2b3b86a9cd8189e6f5fb3f274739c3636e86372593143670c1a0749d7e22ba05428764c5bd0b433bb92c339635a668fcda3e78272008a010b32
 EBUILD Crypt-OpenSSL-Random-0.40.0-r2.ebuild 548 BLAKE2B 733ad66e543fbad7d33faac2d920f43df3c1785563d409dedb9e9f7ab70f6397e71ed48ad908c08b2291a66e1a39b4fdf4d43044ec1f3f81ac12ec48562b5cce SHA512 a452a6805252bf8e0b8ad6103ddffca06bc731e7ed1ca76f84149c6137730954e93bd754496578794d1f696f79b7cfa404e136fe88b8fc1ba6f3fe73178a6ab7
 MISC metadata.xml 413 BLAKE2B 03a4dca7d919259dff481a02856287747167ede1794ca2a3307f653ea32c5e34c0a65d32961620ddb1a549da94b1b6a32d7db3f19651a4ff9e93fac03d34b642 SHA512 db707a5e0349fcbf52586739288ea6b95c907918897c611837baab0b8792e58c4864cf785d719af8b8a096c8bc607d2198c5e627dd4cb5a322cbe42c5bfc5e58
diff --git a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0.ebuild b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0.ebuild
index 37e070e41b9d..c57b55993987 100644
--- a/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0.ebuild
+++ b/dev-perl/Crypt-RIPEMD160/Crypt-RIPEMD160-0.60.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for the RIPEMD-160 Hash function"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 export OPTIMIZE="$CFLAGS"
diff --git a/dev-perl/Crypt-RIPEMD160/Manifest b/dev-perl/Crypt-RIPEMD160/Manifest
index f33365e7524d..5239b18f4cf6 100644
--- a/dev-perl/Crypt-RIPEMD160/Manifest
+++ b/dev-perl/Crypt-RIPEMD160/Manifest
@@ -2,5 +2,5 @@ AUX 0.50.0-header.patch 175 BLAKE2B d62ab324691fbda33a36c30d6dd50e9a363cb0434b56
 DIST Crypt-RIPEMD160-0.05.tar.gz 58960 BLAKE2B f5f68e828a80ed5ba6a771f36900a546889b6e47329adddd0ae833fd0f879941ff3db864f30f233ef9ec1b49814598874702e44443db876a6f2c5d003661fd2a SHA512 75536a00adf47e91fbeef45919ae05ed8520e170c715a3df801a304d0e0de4d9360b561e0c2b952000281e76836bb1a9a87396cfeb032fa4b3e74f452c22316d
 DIST Crypt-RIPEMD160-0.06.tar.gz 58766 BLAKE2B 91d59a068be8a37243f21610a0ca490affcbe3d7b49081710e60bd46036ed68db38b7c1731172b6e8ef9c916b87e4c26099517c3a4dc2d3c1af9e65a8a14f075 SHA512 5c009f8e3a9e42d5fb172f74eb97ab9b7e2912b23d62556f999d6d4f244ff972f7925d357cc3dd5d1e9e708a8350f8f131f8875aae076927c6bfb506bafcc755
 EBUILD Crypt-RIPEMD160-0.50.0-r1.ebuild 411 BLAKE2B 5deff5355d56a0c447f05760587c1aaff291bc37ce257405d9b4eee2a8f27580eee99bb1ca1dcdc0df60a1985cc2bf24230cee519688dbbe0b105d8a611e31cf SHA512 54a574da13d041d5c53c521c38f1c71357d79fe05f09ecebfefad29b8d841549f603260634f2dc0ae0238f2c81ce7ecae3e8426820f70b2dc7633a52e63e0f87
-EBUILD Crypt-RIPEMD160-0.60.0.ebuild 460 BLAKE2B 0e472e0e3932272a054df7eb2332ccb124274d7d7e75d738b0286cd455bcfd1e0e573200cb9a5c5a90fa892480ed125464effb336029d53477ce6e79d44d7b3f SHA512 2e08d77974724a2a44a0ff2697fc18d2761e46d613a57631d0fcb4d7f8097dfdfa9b70f3e03134789dfa6edab472088db48a05f7f5ba576050fb3cea10960f15
+EBUILD Crypt-RIPEMD160-0.60.0.ebuild 457 BLAKE2B c229cbaff2140515710be9a21bc52ca836036aa268db757a025934862b4f02c4f06071d9827f9a9f7e286b0a26072db5332d22a54f3aa4e5370b1b785ed52db1 SHA512 38d19f27377c741a21439fb408ab4ba1d4abb8fd2a5319f29d811fddc39f282e0ee0dac5486e78538d959c3785f18c1ca3a8cb0f35d6a3caacd91d063b494152
 MISC metadata.xml 470 BLAKE2B c409ea10ae5e4aa047f677e6a2d7ce31767221a2c726d19fb3be1af4afdfca3c8f00dd5ee3e5605431ef046282951ee2843ff2eec4878dba5552bbf3e17e0d76 SHA512 bb4053c47922fc41a88ca9a9fceb09312a67fa7b99d382b9324564bf922b76fecb9e9a11ad1e555510e5dd97a4b81b72de1bcf6b9c74d37fb3b7579b13bf473a
diff --git a/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.120.0.ebuild b/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.120.0.ebuild
index 758c78ee5007..43d1c5b8f1f7 100644
--- a/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.120.0.ebuild
+++ b/dev-perl/Crypt-Random-Source/Crypt-Random-Source-0.120.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Get weak or strong random data from pluggable sources"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Crypt-Random-Source/Manifest b/dev-perl/Crypt-Random-Source/Manifest
index f50d923759fb..ed1487093999 100644
--- a/dev-perl/Crypt-Random-Source/Manifest
+++ b/dev-perl/Crypt-Random-Source/Manifest
@@ -2,6 +2,6 @@ DIST Crypt-Random-Source-0.07.tar.gz 18883 BLAKE2B 5354f790c948a57eb2c9245ea663f
 DIST Crypt-Random-Source-0.11.tar.gz 34276 BLAKE2B 3a54bb8e09b9cc871490f5154e3b93fac9cf0fb3a5f9c0e521c8033f37d237074d403748be879310de2ea1f7a859fe7f4777befe7b82cf6ee5bea2b841a35a2d SHA512 0c0d6dfbf904c1047b5e502fba30aaebcd022cb7cd3e6f58800dd51ab6aba4c4bb834ac66b2501fa72e26d3034dd64b8aa945cb5b089661bc291670bb74d4bba
 DIST Crypt-Random-Source-0.12.tar.gz 34495 BLAKE2B bd01673a8ec5fe84b7c22000ebb282b7b7c8a4b5ebe5b9404d1b37d92b670a669ad86225439f30ca44b406272f817f670dcaec98609d5eb4095da2153aa43c0b SHA512 821f464a9b344cd7e19f881acbf295a39ccf3b924f8822acb757c06f7ed2aa95fbee740b98a514dfdd24aae2dc9b5c7898751eab5bf7ea6f88218a6b162c4c34
 EBUILD Crypt-Random-Source-0.110.0.ebuild 707 BLAKE2B 683ff86aad59f5c24bd10bf1523bc0702479a50f24ee225c2f6bb9b22265b3c2032d6a998bc36a92e15ba170f9be557aceac7a39ddd1ce12858750f00ae4ca76 SHA512 a6b57f9f85409efd5dbc4307dc167738cb37fb2746fc2a9afdc53f1f35e96a955a0baaa586dc24075ffc0f808487ef42e7876fbc25f585f1225fabe1336a60c1
-EBUILD Crypt-Random-Source-0.120.0.ebuild 715 BLAKE2B 04a33203abaea93eca48b4f3bfa5173ad9b6563f26286831e87d484008282329a1d67962bd720890aca3e4eb9d2b2bb815dd064fb1b786782259800734fa4085 SHA512 8639f9f6ed244a4ab484b21f6417b646a43aef26ac1dc0c06adbd65713f546e49624e9cbbf8607edca1f63652fb48130c4873836b4e759492dedd8396dbe6c98
+EBUILD Crypt-Random-Source-0.120.0.ebuild 713 BLAKE2B 8ea5e9e98c7cf155dbac36d8eb6575a2d48a73604de525c9b64dd6569ecceb669d659c9dbce925971a66ccfb4449d561acd6fcd6a0f590f03b2fd48ca94f1ec4 SHA512 f3b949d1452711a3571f632bf990ae1639e86239e5b23767cda09c8f22f363688e3140a3eb769d205e0a0ce21b622f79f2d06cd56e9edce2745979cf795240b6
 EBUILD Crypt-Random-Source-0.70.0-r1.ebuild 546 BLAKE2B 688a59cebfbfe7f80090f85c932d0669d559de1ebbd7546f16ad74cfa667e97424225bf29cd9ffeb8cc1a3fd40c1bafbaf719f9c7bd2263df3b180ee7af0d975 SHA512 011367c03a308621663302e1c2f022056a3146e41a8daf3a47f64ba3b51c68cf09c74cd947375dcf37bd2ddeba4052030216deb2dcee11817462073ea10d366b
 MISC metadata.xml 1261 BLAKE2B b809e2af227dbd70be09a7810ae1c957b8a7234792f48feeda4fc5fb42d3b67b62a713baab6738ee87946cd0c2339ca578e43158f7b8665430fb695d239e45f8 SHA512 00ec81dc84023e5d6d0231745552605cb7c7479b58b92927bcdea730abedebec60e8849e580dc0ef603b0f21956f4695e99a6068ac04427c2230c29a62771cf6
diff --git a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
index 3adfb19dead2..e57b1c7f1855 100644
--- a/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
+++ b/dev-perl/Crypt-SmbHash/Crypt-SmbHash-0.120.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="LM/NT hashing, for Samba's smbpasswd entries"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND="dev-perl/Digest-MD4"
diff --git a/dev-perl/Crypt-SmbHash/Manifest b/dev-perl/Crypt-SmbHash/Manifest
index c0a0ceff760a..61fd436fa2fd 100644
--- a/dev-perl/Crypt-SmbHash/Manifest
+++ b/dev-perl/Crypt-SmbHash/Manifest
@@ -1,4 +1,4 @@
 DIST Crypt-SmbHash-0.12.tar.gz 8840 BLAKE2B 5c928c1239cdd2bd722e4fe3595db1b4fdf3e42e8ce78c2d392c1dd1c79ca15ab411c13c3c0583554043997a15347f2bf240033e860a60c2bbef0fa601fa5fb9 SHA512 f5635c897874a771fde1db17261dc8a76bbd2053fc2eb6f49b07ad48ad788943f7430f0bfda8341bd69840332c75be013ca31b97b7f20258a21bf29a2298a70d
 EBUILD Crypt-SmbHash-0.120.0-r1.ebuild 393 BLAKE2B 31061c0920f777436474bd31f58872236218afaba8654ecc7f5513a11697855b0e60c9469b3fe99c201623bf91e88a4c41836ac11457f211c5771b265a115e3e SHA512 428ea795550ef2599a065978cdcaa570e633fbc7e59505e6ef0a1372f452face03423acd307a099a68516b496a078e08468e760eae62c16b9c645daee4f17fa3
-EBUILD Crypt-SmbHash-0.120.0-r2.ebuild 400 BLAKE2B 6cb3315461a979bfc5d86aa27d8fd1536c53751fe8fd4a25efbfa28b785128a3782b1369504391576229680db54e114338ef74b776348c7dc21d99965683caf7 SHA512 a6cc91ca488eb6240068b4b7c42ad285284e9728844006b15d4e0c0cd1cc49b533551a930013b648034e78a9c73d608157b8ca9be4d40d9e0943cb4771eacad6
+EBUILD Crypt-SmbHash-0.120.0-r2.ebuild 394 BLAKE2B 6e6d5c8baf758a0a6d4e628580220cc9950d49c5db33fde31c809952e92fd7b1034b8e6411228c4390ef9aab3d893da748127e600e1103bda1614b3651aa69eb SHA512 664ecd7227e7c9c6d7207d81cd334b55523d71228e3c39f66f71bcdd162a9670ed0d14228bacdd651eefe1594c8f717ba19ede9501270621faa97fa8754b513b
 MISC metadata.xml 398 BLAKE2B 2627731ee83eae37830c754ebb2d1428b2b5faba1bec04c7d51816d63d4550831a92a958d890d1793499b70040bc42e86daf9cd670abed955f30dc8e2b24aa54 SHA512 bf2b954ef8f1fe45389c091f5aface1cf76138919bab46bdab57cda55d2493d2c01575248fd0e12c23e0e79f4cb7166091e6970873156448aa1c64bf50b5e0e0
diff --git a/dev-perl/Curses-UI/Curses-UI-0.960.900-r2.ebuild b/dev-perl/Curses-UI/Curses-UI-0.960.900-r2.ebuild
index e44a5b7d8b22..ad5df5e83dc9 100644
--- a/dev-perl/Curses-UI/Curses-UI-0.960.900-r2.ebuild
+++ b/dev-perl/Curses-UI/Curses-UI-0.960.900-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl UI framework based on the curses library"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Curses
diff --git a/dev-perl/Curses-UI/Manifest b/dev-perl/Curses-UI/Manifest
index 23720b1f40ff..ce3702627d08 100644
--- a/dev-perl/Curses-UI/Manifest
+++ b/dev-perl/Curses-UI/Manifest
@@ -1,4 +1,4 @@
 DIST Curses-UI-0.9609.tar.gz 155842 BLAKE2B dd635d48d31ce8b35d499c5479fef53a1c5f30afbaa9341ba97f980e7cda1141cd25daa766603cfa3690811e8214d30cadacd089c6afad44de7c9b43d0f6826a SHA512 b92bf34b3d6b9434b948bb8c4a490e4fca4f4edc7289fd5be9fddf4af68424b12ade9c9096ab6e9b292d1863522a1b743b0f68aabec745300092a3d59e43762a
 EBUILD Curses-UI-0.960.900-r1.ebuild 647 BLAKE2B 836bfaa0fa9e8aacd6beff71b6e87b0f8a2fb9fbe1ae8777d9096db056acee1269caafc7faf8c6d6da316035a5f4b8a9507a572c6a7606e85ba8a62a2de5efc7 SHA512 09344535e8d3b2321f18ba731a939b32ff044a4df6dd1636e67bfe57fe3d82b6825485244f87288d6695685167d5944c676b0edeb2534b03c0916c78a21dd45d
-EBUILD Curses-UI-0.960.900-r2.ebuild 633 BLAKE2B ba7bf544fd3aea0d82b8ec744df6d41c4524a442206166d3929fc0473c9990e994dd2497b46d84d0ab3b5e1cbf5ca0e4da3e627a2f9dce4e7851cfb9fbdfb84c SHA512 d8e3a9c0d738ef25bbebc55881cfb9c123e0f3e57aafe13ad98799424c03855ab42046ba540059820b0731ef307344db84a559d6124b039bfbc8ad0be639bd0e
+EBUILD Curses-UI-0.960.900-r2.ebuild 629 BLAKE2B f77ad0d1d3a3c4e4eaea1f38acffbe0ad69c30bc24a3ae1546562172d76490beeb0890ae43b5dcc8c953863c7a3263860671fc0eaa280334f02e2f04f61d521e SHA512 1353d9f911acaa5e8f63f88293cac6a4bda8d822bbba29f802624dc182dd102a4a1d52c8066dd7066f4b2d1c3827a5c2890ea309fdf392d7c7c112181bb86e68
 MISC metadata.xml 3831 BLAKE2B bd68a7cb0fb0d46394bec5087e7c374caeb65d11dbc3767b054f167069f58d1470770a68ec6fe091dc854c34a2ae7a7ae61d48edbd28dd64da416af3dee25ba2 SHA512 5c82bea4f715c640ba0d8478d10577034638e7966c6db475e2f5d2423b82e60f06382925ee0d4d4a9cfb083729b0d188c5e6cfcd0dd744e37ccba37fe45d74c2
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
index d7d5cb374d99..9f25f7261aa5 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Temporary changing working directory (chdir)"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE="test minimal"
 # Cwd -> perl-File-Spec
 RDEPEND="
diff --git a/dev-perl/Cwd-Guard/Manifest b/dev-perl/Cwd-Guard/Manifest
index e777bd960533..1cd170203132 100644
--- a/dev-perl/Cwd-Guard/Manifest
+++ b/dev-perl/Cwd-Guard/Manifest
@@ -1,5 +1,5 @@
 DIST Cwd-Guard-0.04.tar.gz 9883 BLAKE2B fa9d7ea8d378a223e4449c635dda13f08176295241c9d799b87d943c4df0b0d13ef06f4d9ad752f6bae5c64621e5cec2effddddd9c8452a29f9c7b4bff8a9750 SHA512 7402203a51b1be99e91e9dfd1cf0e3577e5ba16afe8d808ab594bcff1603665399dc48fe867d40d9849cccbacfda0572fab09e8ef81934a251bb44625eade6f9
 DIST Cwd-Guard-0.05.tar.gz 10253 BLAKE2B cd11c91769212a5b77ce267542d6ddc231ff4ee64baa5abf88035d3fedfe005141e571b516b799f611488347d89896f16660c66a58e20729b0cddc6753b89163 SHA512 14aa68e535cec8f7182d5648558c539cbf6eebe2fee9c59d0b06f5b45cca1c6c652104a58f71b5a56f796f03d139e3e74962e45fb127bf038803b05cb9f32b82
 EBUILD Cwd-Guard-0.40.0.ebuild 545 BLAKE2B e51dbc45dd0dbfb1a2e33dc96d903ca1e1a08f2b34a644acd42ca2144ddbbc2f62ebd91cb2cf933a6c7acfa83ace0c24478e886336a71a6f69434d9b611541db SHA512 aac459d6e62e2d8f02085edb5345d8ca50fc20f80aec430a931629d088bfe8a18ba4b656cde61a9cd59908c47dd691cd0796c7d0de44f47047ed10cfd2d37eb5
-EBUILD Cwd-Guard-0.50.0.ebuild 623 BLAKE2B 6804f506f62ed5f20898b16c5625a1e22e63a444f1c447c0e629935a66e41f21665c58e80d22252544a34221e7954a38db2fbe71d41a4ad2419864e829453cb7 SHA512 8cee19a6f18cfba574b54aa979a37b9901c0ef3c383f1bb3f49a9fe63ef8ac3935925ab7ad7cc8152b8795ffbdd0fd3567884b699355ef95f2e4e6409ad164bb
+EBUILD Cwd-Guard-0.50.0.ebuild 622 BLAKE2B b060fa323e936aa70effa4111d77da4b6f5b178a2d8ea834fd786467269427dfd0090d03730781b167b717a8709ae169ef1eb1ba0d942c215a73bbfb0f0fb582 SHA512 eeb23c4dc735730fe32fe03dde12c1092388740322d8ab4cfeb65db64e45a1dc8b79ead7c6947045eb8cfb97461bc4aff4c14303136e0874e2f102a5dd83fbd0
 MISC metadata.xml 390 BLAKE2B 1c9d88c362c73b45891121b3ed52681c244cce889a8dfb2f2285b61d74700106f9a7a1dbad243ce32576734ac6cfe29fde8e5131185f0bfd0170291e1b3a350e SHA512 b103d96a5b31e484d29b5f3043574dc7c4d1602a5ee2c904fc84f591fcc9758db92ddcfb1c1303ca22164f575af5e8ff809af8817ba78ae4e8d2f5d1d557aca5
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
index 4aaa51764c32..a5a1f22a1123 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.540.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~kentnl/distfiles/${PN}-${PATCH_TAG}.tar.xz
 "
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test system-sqlite"
 
 # NB: Get min sqlite version from sqlite3.c
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index a7a0b6c47196..6cdd3473458c 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -3,6 +3,6 @@ DIST DBD-SQLite-1.54-patches-1.tar.xz 8376 BLAKE2B 95df8ada4a1d1b2e730414a6a5b5f
 DIST DBD-SQLite-1.54.tar.gz 2136219 BLAKE2B 76700a1c695036951ed2ccd36319d509be6292554b7b7aa49da4ec07f1c15a75ae84886bddae96b536351a381b0cf52350d48ded836e1c4627c57d4dd9fc2bdd SHA512 a8daff59679973467dff80c013b6ff9d7229a505b62c0312bdf7f9288af64dcd2e99f889b66eb98103b0e6ac7a9b0fa7c9c517c5c2673ee7f84b3b6b5d26173e
 DIST DBD-SQLite-1.56.tar.gz 2248699 BLAKE2B d6af8efed8149ff2ec5c68cc071355805f4a24e234e015c180d5326a4def4eab33352d168e9e41c06b2de28a0137f0d39a864749bfa972d28f8ec9221379bdc1 SHA512 1c9be3557691f76a9e543fe4bd6656a6b82f53fba4bc05261a55affa0a38b4eaa1cf876da975234c9c09985ba25b21f6f7a735f1cc47104169edf7fdd3a2e314
 EBUILD DBD-SQLite-1.500.0.ebuild 1194 BLAKE2B 43ab9a47864bf04e7674caf842c0dc3b9f39a0249918a3ff6f3645c2e84cb419556b1a853a416ce57a3ea6a0c81b539de5a6fc46d5c0f74bfb67583c2ea945a8 SHA512 19a2bf93c244af7eabe768629d2578e937e4531cdbee3b809eb16cc2ae70b6235ec1946bdb29a85b4fb2cae63def640e1146845da0d63131af5aedb01a6a74ff
-EBUILD DBD-SQLite-1.540.0-r1.ebuild 1524 BLAKE2B 407ecb533d3b1a6768c90e63706e9daa03c5464f28c4cf7225cbc64e20a441004f06ddeb3465832da4604bc9f6b5876cd01dbda48bf3326ec18817ed0bced687 SHA512 ba86c41a3b60a68d5b7cf65d8ed6dc31e686b54c030ca438e0457636342bfa60e047faf5699c228a363b295c74fc9fd0d36d40de3acecbd34391aafdf771f360
+EBUILD DBD-SQLite-1.540.0-r1.ebuild 1523 BLAKE2B 323926e2634a8539e0c6c7933599ce21b1425acc14beaf6ba637345f688c31a96230515b783437c278caea13bab9cc39dd9b7656f458c7083080a8ae6235ed7d SHA512 e52ca31001625c78d9ad7305aedea04cee82d5d2adfbb87ab309c45032b110aa6d7cff6b06d9cdd27dcbc4fe8f67fe7d5c2e0f325a338ff570805fcc2441e618
 EBUILD DBD-SQLite-1.560.0.ebuild 1300 BLAKE2B 5d4fb9df3d4fb011096247b0ba6f435aaadb588818cf637f381b445ca1d745bebd1252a60f61bea2112a0c12c76cf4ca947b52ffc06d004da50b4f5e297fa3cd SHA512 2638845ffb4ee5540644d0e5a21f91f1a6e2f6d84a04f499a1c0175d4a36d8de0808cb19f2c84788cf965df6dc5b8dcd7207af45cb315cac9cf1111b8eda5894
 MISC metadata.xml 1076 BLAKE2B da1e831d74cde4db051a301cce34e8a64ade0f85accb892a72f5480db33ce3672542932b455b69f8cb7c0abf792799639f8c06c572e89a0abdba64561d2aa4f9 SHA512 6dc34ac81f2eef0a16be36407d29a91f341f19706a9660d751b5d4b289b44d6595f31260a4987b2cff22c4b02440cd07dfbcef48b1422da5ca96a5dcfdea510e
diff --git a/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild b/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild
index da4e3bb65e64..b143157d112c 100644
--- a/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild
+++ b/dev-perl/Daemon-Generic/Daemon-Generic-0.850.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Framework to provide start/stop/reload for a daemon"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Daemon-Generic/Manifest b/dev-perl/Daemon-Generic/Manifest
index c1c0093cbda0..e0d200218876 100644
--- a/dev-perl/Daemon-Generic/Manifest
+++ b/dev-perl/Daemon-Generic/Manifest
@@ -1,5 +1,5 @@
 DIST Daemon-Generic-0.84.tar.gz 15065 BLAKE2B 6d9cb22fba12b8c0f711a4033843d3a036cf7f212885261aa5f8277841f512ab3f6374a01522e5192de4f8a86755f5d943a01e5302a6fb3ee12c319d3c1378de SHA512 eadf060653ec86b982f4388777b15bfcad55635042048d389ba7d88d2de5f778b849a2fabce3524f05e041fc76a51eae4af14e759659616b7d28fb4b657178e0
 DIST Daemon-Generic-0.85.tar.gz 15101 BLAKE2B 43c973ae1a9b601467ede6b411872f7824a0476c552b3734e45286f47b6d892d45182afce0815b11b9f555089f7d18f2943938d294f9ee67de7e0fca5e5c214d SHA512 fe23e58d08013f9b10fd741f40636b44e20e7e8278be6ee6f6eecae59f18810c5d485e85fe56ded0ef23c3318b5a994f6821829a9966398a54b70859d827b9c4
 EBUILD Daemon-Generic-0.840.0.ebuild 485 BLAKE2B 40e175c6c3e8613e24d0d9c6cd8c38058d655220f725d48d8ada36070aeb0d5dac3173160c52b464cce65721534613ac824ebab1fc0447700b1de70afcde661a SHA512 af03bdfbec990e98872d19d9bcf9c42742c7568b2efb4631e7f176ef2dee840507776873eb81d6617897f7eaedc97cb2dd72a4b7830a3d21c5c12a6c9c9e8bf6
-EBUILD Daemon-Generic-0.850.0.ebuild 639 BLAKE2B d20adba278a2a894a50adfe62d60eaad3c5624ff16586af7f592ac28cb045cb02ff6030ed92be0fede903dd9d23e03680ca7281682c295fb9d7ed789c310209d SHA512 ca4f8e5002d865d2ae1016b460a5f94c2b06a8bd096f1901c7b6eb971c115695fdaa49537b100b9e9af502d4b3073a734cc97fd64f0a6917c09b403bc0f58c4a
+EBUILD Daemon-Generic-0.850.0.ebuild 633 BLAKE2B c5ad7175c120a8c682b62a6070ac8e41ff3dd76c75cc7a4cd108537d3cff1941d59ef14e96c436475245f89b37ac6c28630bd8c685431419b2698e2e1b669416 SHA512 ec58d57d7d356c9a3e93f0e995e65b659e2077981fa5dbe46a73d5f6462b2edb4c31b8243e78fa134f30ae63d2f5246930fa6e1a687cfd37f6340c82a2994638
 MISC metadata.xml 611 BLAKE2B 832690f101bd7e841df692e3d728efdeb9c1bcecfc048cdf23c834add50c52abdddd0aa7dea4a148556b3b04c764fe2f27bb24426c25e22c5c884ce5b8f51713 SHA512 440e52d14fc917b933cc3d14636380e0b179a594c6f96a195d86483af30137679952af282a5ed94b58a5364a0f798a8f8e470a87c55487bf17ef045307299221
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild
index 55615c0f9af3..63b2a572fe9a 100644
--- a/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild
+++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.880.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-perl/Image-Size
diff --git a/dev-perl/Data-FormValidator/Manifest b/dev-perl/Data-FormValidator/Manifest
index 66fad76cde74..e956d3a12544 100644
--- a/dev-perl/Data-FormValidator/Manifest
+++ b/dev-perl/Data-FormValidator/Manifest
@@ -3,5 +3,5 @@ AUX Data-FormValidator-4.880.0-skip-readme-pod.patch 929 BLAKE2B 7b242ff1b4edc37
 DIST Data-FormValidator-4.86.tar.gz 101409 BLAKE2B 5c5c3abf715155ccf5340c9f95aef6bea26452376618c23164f5d025cb21615a6db4d4839f306443f775883a8a90495a7a470aabdbef52d697657ee2ac5d8bb8 SHA512 ca9e178313dcc15006a0d5557494d50d9328ae4ae9b54428bfd76b3c6169767290f819c70af1928f772ce9a2cd2139eb373e69394af8f03eee0f061525bc76f4
 DIST Data-FormValidator-4.88.tar.gz 99850 BLAKE2B abb72030dd9b6155c83aa95d975643c6ebd4e4b8b15b7cc360d1a2ff81eddc9b210e8bda7408876f27bba9241541f1e3e6289ebb037a50e0a77d5850b281be76 SHA512 f4f9d813a3c9ae3cefdc1795516c955307dbaa23ca464e5a0a31eb4a9f43a3f31da8155b911433d29915d65da5b05d0843b7de45287d977a0c58ba19f3cfc736
 EBUILD Data-FormValidator-4.860.0-r1.ebuild 669 BLAKE2B 5c70710dc63dcff24fca79c75913c8c64831a0e1cef743ea92cc3cce9c8888b5fd9ff06dc2d7e8746365feee757b7421fee5da4d7a92f9a5bba231488044b2d2 SHA512 29f21b39c8d6d31cf86ea688e3c125aa1bdb7766f5f53a6005b69844f55600c377019ee0e514e65fef48cba967ed862ddb1da19a8787ce80c77e93aa0864d5eb
-EBUILD Data-FormValidator-4.880.0.ebuild 2123 BLAKE2B d6023c32373f4ea2558a1da4fdeb6cddfc71c489f5f68994563436477675ceaf8331ebfc77fd5826536a61484390077f5b926df23b799f468100bcde43874644 SHA512 be6943c86fee373305afe0db9f483ee158aea728b9e3f3a2a130877343d1a93e9766dbf71e81c137be0a51952a02980d3d13d008a9cc1f2997645b467a4c3dba
+EBUILD Data-FormValidator-4.880.0.ebuild 2119 BLAKE2B 36bd13c8b6686626aa6bfa5861c8d589897488b92a0b8deacb55e2599b58523c1efb3811b15899e2f9153b0796c8ee00402f89777fb7e525a5f01de5e2851dfb SHA512 e30410f07a92aa67cfc16d925b9633863522b3f05b7c719617d9662e754112771bf01094968df973e6b6917c0924cded78639368febb8b25c3c70974bedf808e
 MISC metadata.xml 989 BLAKE2B 0d66c4b6bd1f4670a0a63acef6454cca651ec6e856baa1549083c9ed357a3bb437d2dc5ee318353768adb1ebe52436dd82aad287f60553b1517aa858f117a00b SHA512 39f935d8c1a17b313a288065757f35134e7f8440737397f50abf30ceb6071372ef253ebfd92d3f9996c99cce6374f3458ef4c98f9010aba10f3e791762013de3
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
index eb0973d15831..994558cbf7a2 100644
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl extension for replacing a link by a copy of the linked file"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-Copy-Link/Manifest b/dev-perl/File-Copy-Link/Manifest
index d3df5c72f90a..f47c4f6f8b36 100644
--- a/dev-perl/File-Copy-Link/Manifest
+++ b/dev-perl/File-Copy-Link/Manifest
@@ -1,5 +1,5 @@
 DIST File-Copy-Link-0.113.tar.gz 10947 BLAKE2B ed01df682e1fe6e25ccd80122edd64833219a7eda81bb323c40c0bc1b3aa9d8780209bd70808d6553242e66e5f888864af1f8de46b395b2b2d2293fa15318725 SHA512 c1f51f107e81b0a88391eca66291f484600b193d5c219e44fd7f94fbabde0a9459b98cab5de9c0993374a775b729f7d228d87889c9395465c90b0295f4496f91
 DIST File-Copy-Link-0.140.tar.gz 11157 BLAKE2B 4f751ffef556ac7cedb57bf8189f4e57a1e64210327c9bd28401f52c63437a88418fc41f5c1f8624b7b3bb66496eced9a36a3ed3cc320e614a6b6cb9dfb28548 SHA512 d937d8353c4be3070591c7e28ea177e587326936cea6d84d895d0fd951e663e506c5680f0d8acad756972db7c70147b31078a2e2595bcab4bb56879b97f3c8b1
 EBUILD File-Copy-Link-0.113.0-r1.ebuild 490 BLAKE2B 5537ea91028d0eee7519ebfae93e1bcd35ed0d5bba596191c499cb25a239843a8d277aa9114bcd5a8cf00218c8950ebf5f9d0abf15a655e22fc0c3314bf594b9 SHA512 7ae6f9e98d0538bd5fdff7aa19de9f9d34a896aab6d564b37ed2843ba4b5ad3f9d9bab633db7498f3c22923d1885e83bb093bfea3313a6c9de6f10bf796e3ce4
-EBUILD File-Copy-Link-0.140.0.ebuild 545 BLAKE2B 08c803e7c072f8497528cea850c8eaaa2cf3c701a2c03f27e9f8d088d183a6c6d03b75c498a650d048ca474048cb8de8ffcee5c9e73f7ede302ce34aaabe8930 SHA512 d9b04edde2b6058c3cd4e32efe0d2e522c6f35a663276f69e5ae9065b5541b896aca5ef91126ae9b8ddc46c258e15a2b28e384249d3459e1fa62803402132179
+EBUILD File-Copy-Link-0.140.0.ebuild 544 BLAKE2B 1b5deb24ced7fa23a18b41b2e6672efd878ea1cd0d72f47169a55d2f37975380e289a789280d5db1ee3396eb5979520c6c376a8cd36a8ff567084d708794e8aa SHA512 633ec04ffabfc88757da0bf914cfb6b28be09c9e1f23dd20666332c2db5fe952eecfe10855bf4eb944a73264ab3bee734aab1b0d166648c5f7a7cdb706ccde19
 MISC metadata.xml 1172 BLAKE2B c22400c6068f74c08ec59ab7607acd517478c1335dd6d1e30186490ed8be88b576009250c99891bd3104b944369e6dc6ac6cbca75aa072542128815ab9359310 SHA512 b1e74608a35c3c6b511186c1ef837bc515a682fdd9ddffcf4c76f5430f16616a1943c823ce9772c988eb12c150129c29241526969085e61b92db9c1ebf39889d
diff --git a/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild b/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild
index 4fe48c7cffd6..483c210c6bee 100644
--- a/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild
+++ b/dev-perl/HTTP-Body/HTTP-Body-1.220.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="HTTP Body Parser"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 # HTTP::Headers -> HTTP-Message
diff --git a/dev-perl/HTTP-Body/Manifest b/dev-perl/HTTP-Body/Manifest
index 6f9d65e0603a..d8c38577dde0 100644
--- a/dev-perl/HTTP-Body/Manifest
+++ b/dev-perl/HTTP-Body/Manifest
@@ -1,4 +1,4 @@
 AUX HTTP-Body-1.190.0-CVE-2013-4407.patch 1288 BLAKE2B 776bf905aae20f57c89b443bd19860d2165d9df9061470dd2e789a4554a9950488127a42dc096a4e22d6866b2219ac7dc6b847c0ec551c947c09c6a1b8651b3f SHA512 9e2988eb26b54588d314c9ea7511dfcb1c4d91cac60fda7db5f3c41ebf72d6b16cb1e3983817d63ea28b413f82489c3e69f332daab0ff049349ec97b4498bfae
 DIST HTTP-Body-1.22.tar.gz 26163 BLAKE2B c6b2cf67fd9964fe253251dd91a67b11563c3cb157ad670733254acb3d44fcede97dcfb84d09ed52bc9f8cc60275838abd8f110aa01aed3bb18400bcc108b255 SHA512 62665989d76699a3c3747d8f4e23d2009488bc229220bcf6fc07fc425e6ac5118f6ea48c75af681c2f29e9ed644d7a7979368cc36df77aca0544786b523c9cfe
-EBUILD HTTP-Body-1.220.0.ebuild 879 BLAKE2B 1878843ffcfeb373d2bcedb5be71f009ea9c388db1b7f3588bef8acbd2427e1b3c8ac1c352515e49b15baaf72611298dcc4aac106750c0b67209d4a8804e970f SHA512 75fcddaa49753cdc68bf61e51fbf65b1d2bb6dec25b67c3253c76ad2cb763cfaeb7e70928a8e623b00636a9651158ca8b25c414fa347c6dea1b52b02ce8dedaf
+EBUILD HTTP-Body-1.220.0.ebuild 878 BLAKE2B 4da3fa4e04a67692e09693d832b2027f8a233857756bb71ebdd81d55b5225e06638a2f7a03f6b450c26cbe73046e5494b9ca6ffcc839122db822dec30fc12507 SHA512 a627a38c26bb1a86c88a56136ed4602614df3050ef9d9c6b7622c977eea945424c9e374c40f9b687d62dedd86a9e819b16c85445e1dc83aac256e628de9dabbd
 MISC metadata.xml 736 BLAKE2B c5cc316719b0ae7cc9705f52b543df8f15a7e9518ec950d525ed38acfaed9becacebfaa3bc3e011fcec6a1a06792a8bcde56d24f1e922b03f35d714d6f94154f SHA512 3bc205adb892305068cfd7fd3c78ab4cf65628155277dc64951b07352ccf70c43ed22454ff3ea722f90e212306886d7ae3c89d12a3ae9e8e14f35d9674533450
diff --git a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
index f8dc71495584..1c76ec07ec2c 100644
--- a/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.120.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/IO-Tty/Manifest b/dev-perl/IO-Tty/Manifest
index 3c1b2d2ad900..e85c7312943f 100644
--- a/dev-perl/IO-Tty/Manifest
+++ b/dev-perl/IO-Tty/Manifest
@@ -1,3 +1,3 @@
 DIST IO-Tty-1.12.tar.gz 24564 BLAKE2B da0b252d938b115e8cb7e46866829fcf76a56754c5c3cde8f64dcddda4c9bde9cb77a1b1a022dc8ff94f785d1e1020f76be3ff805c50f276902128d397039244 SHA512 23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d
-EBUILD IO-Tty-1.120.0.ebuild 406 BLAKE2B cbbb4373346a9de963f33816fa415161560dc94bd546dcd4f6e6b0d486d0bb89056b846ee42c252e899e6d343fe48d96bb1805d24d543f20672a7684c61a8846 SHA512 5e58485095ad8cb8af0f76390fc45463f77491d4efdf47940e13778efb91653aa0c103433062dcad1a334ed4c81a3c97f2f1db9a41ff433e8825bc78d997a18c
+EBUILD IO-Tty-1.120.0.ebuild 417 BLAKE2B d1514078b41f6873bcb88cf91e01af2382413a7fff3461607a3e31689d8ccd5f139ce834495cdf72390213d25f3c32186dd166bac9cffa83aebbc808c603e6db SHA512 58c67d34910b71c9f4758b93db5c79d09653be4ebf8d08f1ba9773708e59ee3ee45ba7b4788f9bd523c6a4ff832af75c37f436e84c84f8bb6f342168cf7ac9b3
 MISC metadata.xml 438 BLAKE2B 6008db4a5c8b043e0212175dc9401efa1e5e78c24181076645fc322d653f4deb0fa37439fb23cb0b84eddecabf4b1b1db72115d0431ab114a2dbf673741dc0c7 SHA512 6c1792c3eedaa6d8c766d0a2f030b04cf9a19c9dbc80209f57a206bffdeecaaec0d98bf96762107e0918b2129f1d1974694a5ed61869f91c199a87fa68fdcbeb
diff --git a/dev-perl/MailTools/MailTools-2.190.0.ebuild b/dev-perl/MailTools/MailTools-2.190.0.ebuild
index 9977e7ce7f73..634c4dd38253 100644
--- a/dev-perl/MailTools/MailTools-2.190.0.ebuild
+++ b/dev-perl/MailTools/MailTools-2.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Manipulation of electronic mail addresses"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/MailTools/Manifest b/dev-perl/MailTools/Manifest
index c7ed487dc200..571c3097b9ff 100644
--- a/dev-perl/MailTools/Manifest
+++ b/dev-perl/MailTools/Manifest
@@ -3,5 +3,5 @@ DIST MailTools-2.18.tar.gz 55263 BLAKE2B eb7f48d3f33c0b691a7eb42ad186d6fc98bc900
 DIST MailTools-2.19.tar.gz 55887 BLAKE2B fedfb8fcf94935746b3678b34ea52dc90722646ce28138990952325d8f94c26204fe8f0d1ae9ea541663b7a4875330a8006987dfa581457f62763fac64ab5d99 SHA512 a4ecba2acba56f2d41294e1b299c08b138d5e4796880635afcea7628adf60e11d5b138fc56001c331f765048bd91fa94da27bd7fdeedc51ff91e4ef5770a068e
 EBUILD MailTools-2.140.0.ebuild 591 BLAKE2B 0f39ff1aeabb8fe8394b2419c1ba73eaca443175a14b84929c681acfeb5eb02a3e65577336b43da326363497cfa20e1cad920e68067cf9ccd4611845781bdc98 SHA512 576e1006edfe1ab5cd6033688c5eed6cfcb01fdd873b43d15e38daf15fe0cc7db3af2bf943e1e9fba7ca0c99d9a1811b6b7097c25a080d82be9e6d1212085c8f
 EBUILD MailTools-2.180.0.ebuild 601 BLAKE2B ac3a04002eccde3ea067deb3c94ce3e27cb60b925a260aabfaac5c4ec6076cde6e8a4101056623d615a2e0b034e8dd8668389d5dda0e3b3dc1f568da339dbc03 SHA512 c10eeba31e9eeb8ccebdf1eee9fa7a7455fa829a5630ce0c77cc9167ac0d459e2b2439dac71a85374bf05f0badefe49dc807852ed6dc723058c7a68b1473984c
-EBUILD MailTools-2.190.0.ebuild 613 BLAKE2B ca226c4a89045405930f24ae8cd9efba5317c20921303c9155e7ace1aad5ca4c6403b712d8d89d9c35f6ee9455d3b69005f7b25b9ae3862adc59bfc50765b8c2 SHA512 7cbf04089c4d64ef3b34fb49ca38a4de4e3bd1f0f2ed7383406396be4ee5dca17bcce54242980d265ee45e9e94a6e2cf8e2c4cc4492aab6dcb41087204a7e7e1
+EBUILD MailTools-2.190.0.ebuild 665 BLAKE2B e048890bebfba07610fa4d38f3e9be4bf2586f4c2798f368b5e5b2ee7172e521971cb6d416ba6c69360a500814a6a3a971aa3d8c8c9c019b40d1a2ad24e937a7 SHA512 d28320fed82bc65b95ac935024d1be75ea600f05dbe55c5311a9bcbc89d983bbf1c3233658128b4d5bd44a62d5883c5bd235a36775716e6c3c2250a55c3d9602
 MISC metadata.xml 1734 BLAKE2B 8f4ec9850270c7af488676002e89bda5cbbeeaa14516f865c2d0603fabacc1b560511a048b109dc823f412a8a84c9b4084a89259879580d881e42d5b9d441e9e SHA512 24fdaa48c4c5a36b7f77ae6d1fce705db6d53cf5e2280136fb10b24acf869f7ac2b006abfa51f8711cfc74b0204c4bfc06d4fd8e4b6cde04dc53e3e018b1cbed
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 02d650e5c467..73df0161cea1 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Pod-LaTeX/Manifest b/dev-perl/Pod-LaTeX/Manifest
index e911399371e4..70fcf1296654 100644
--- a/dev-perl/Pod-LaTeX/Manifest
+++ b/dev-perl/Pod-LaTeX/Manifest
@@ -1,4 +1,4 @@
 DIST Pod-LaTeX-0.61.tar.gz 32618 BLAKE2B 6fa102c637c3d990247446c09fdf86cdaa9c4a50fd09a5d386c2b2840de0cee7c64116cfd27badd6cc4b08dd17fceb9a4f58eefb4e4b27599baac158bd44ded1 SHA512 c9b5d8b50f630e25e1f913d95d83a1323e71d2c5a3a794a543bdc9962800e5979b3e58595e7a653a96f9aea1f321c1564e2062e9b9d70d8c4d1c6729cb8df498
-EBUILD Pod-LaTeX-0.610.0-r1.ebuild 444 BLAKE2B 4e1a9d5998709596219e43c96050771e99c08aa75d0b6b8e10847418f8282d411d18a51648310a1be72d08e0426d1dc6e7f632b62b69a8f7b87e7da521f9923a SHA512 33812219178bc67a705c78449818160b370ddc58bf437d30705223a83376e1d8e17ec1a6d3c189c5294f82f6fb7477580fc6b9f239c716ef73de07ef196a410e
+EBUILD Pod-LaTeX-0.610.0-r1.ebuild 455 BLAKE2B d236ca8c71b67c403fabfdc4592b33ec2913d033e362b5323f683ed1a9d3cc4e251a73279844b935ea7a5254a0c474603193e950d9ed10cbcb72a2df45d482ed SHA512 7d6ef0f349f71f6c93e52706acf46bf284ec2933bf15b206941624d67b6fa4985f05783db20819013a8dfba23ac5475999ba8de9497a76839f10ce23737579c0
 EBUILD Pod-LaTeX-0.610.0.ebuild 467 BLAKE2B 2e28667c70badbb8ffe9f1ec60bca38dd34d8bd86dcd5d1be17a6c8869a9207e9e8b95e8cb20912d227158474e7eedda82ee0e32c86491326da6323f4fe55416 SHA512 ee4628afcdadce3d6dab979df04e864a5c7a6377651b15f06023c87d3c8a5d9402d18d34a04ff6b15b750fd06ca8342069d9540c00f286d6cb7d27c39a43afe2
 MISC metadata.xml 390 BLAKE2B 4c5f45fedf26c3fec15f84ec9be02cb52bad73ef1ea1440660d4b5be42f2b6b6b90ca0aa5c7791fe38ac9b3848100c4045a350f0407e442140f42bbfa4d3dfa9 SHA512 341aa40bd68ff1f379b3b316a95126bbd491942545992ec62810de8b3f471493960fa1cc51328908488daaa5d1ef4a299f2b6f8b59b78e22b53985300759cecf
diff --git a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild
index d275857a6a92..4cec067ddafd 100644
--- a/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild
+++ b/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert Pod data to formatted LaTeX"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index e57c5c5f2b40..146d1b14038e 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -3,6 +3,6 @@ AUX Template-Toolkit-2.27-no-dot-inc.patch 1987 BLAKE2B feaae674dd01ef2d7ae7c1a6
 DIST Template-Toolkit-2.26.tar.gz 503055 BLAKE2B 1d95cb4ab427621e1648df657ea516183650d05dfcd249f23b38aa8964598090b7ff564017694d070622606d883745a44ed7ce7141c99e11ac785e937a7afbb6 SHA512 97e49392542e240840b44f0d78ea601afb26a6675f76faa9765c158820d596308a7f35057bf347d51a86a5f9134dfd4a02ce7a80b47a98b9bdbca68fff9146d6
 DIST Template-Toolkit-2.27.tar.gz 511172 BLAKE2B 62ffce1fe5679799afff6b3865882c91e70efeb2ec14474f3b49bdf35bd64f7ce4439d5c58ddd73bad26589816d2f24f4691a02c69405fb6b6b604d28edee4e2 SHA512 17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6
 EBUILD Template-Toolkit-2.260.0.ebuild 809 BLAKE2B d85dcd78014e419981572297a6b79300eab3ff0a1a80bd5d47c7e78a6ac87d4d7f2f670148927bbe7ee2b177b6b61d779ca5f41a9b829e1bd9f5a8bdd96cbc6f SHA512 bbd47bd6183d54dd9437222a235a1ceff4acdbe58c0f90a8afa87a9cf3394ed2c50cb2e7c6ad731dd5872c86a9ade6d77046415e3d50e293b4eaffe963f449e8
-EBUILD Template-Toolkit-2.270.0-r1.ebuild 1045 BLAKE2B 83ceb401ab4e104d1d402a25a8c3c7cf79b928034ec69f54f6e83f8421aa085e38fe5c8f8f85916fb2bec87e2bc18099a35bea89b1f0a620899421819b09d9f9 SHA512 5e4c160de50d86eda8b053a4380c88c97526765c923b29d4a869519d72c74eb1ea5071ec94c3aa2f3b6d5e900db1f9fd9f74999dca960f34d9fa604cc89b6611
+EBUILD Template-Toolkit-2.270.0-r1.ebuild 1043 BLAKE2B 2cfd47bb00be4a268018c63a209358dfa0692187a16739c52a5c9c017ed8d4f42306b44f5fca57736f6fa875861477c66b9ee6237c8df2595ca0264324cb2521 SHA512 d130bc14cd93c6e815eec7a42222ac6079bcb72207fa305e45297baa20033164eb5c50d68ce933db77c9e87b222091a7376f4e84601bec62e3df306692306b52
 EBUILD Template-Toolkit-2.270.0.ebuild 927 BLAKE2B 9affb714afc2b63b8d8e36361c0c0c11d07f13794582fb160f865941b0d5f78e180a7549c6576c8ab716c12ceac69b37b84eb29d91192c42ad2b038ecc17f118 SHA512 9fb01cf3500a543e06ee7dac1fd1efe01d651da5d20deb6bd8a2883b8d6d8b9c0087488e985f7725d3102d8fcbf176ab4dc071f584f1efd37c338ad73245eb8e
 MISC metadata.xml 3834 BLAKE2B 0d0cd7506fc2864b9e26a1d580c53931016006ed82e6a788a474f80b490e780da32e07855778bad14ff4b8c444d8e79f6a42a71013bed0db95d0ba8a14f395b7 SHA512 34d9afc89acd0a65724c1af1f5720b15665fcaf06e25db62210bf8fe7dc7c6e83009c0ba6c346821d320de5587cc678c921d0982d3ca317633a6c049ffeee1e7
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
index 3457a2ddf638..b368290f838b 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
 IUSE="xml gd mysql postgres latex vim-syntax test"
 
 RDEPEND="dev-perl/Text-Autoformat
diff --git a/dev-perl/Test-Needs/Manifest b/dev-perl/Test-Needs/Manifest
index 4b5e794ee6a1..f8df03d02762 100644
--- a/dev-perl/Test-Needs/Manifest
+++ b/dev-perl/Test-Needs/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Needs-0.002002.tar.gz 8106 BLAKE2B 76f68912fec154f78995bf940380a9b5e311e5489f1a71ad9aae5c1e7d950d924baa67c8e1eeeb4b171b613194d1419985d3dae10871bce1244ba9b01fe0bb3d SHA512 ac8e1a14e55bbce3747a6bc424216ebf2f35eb657b107492ff47afb3a1fc909bf385dcd79114a0be4b9bbbe0f3a60a56d6f9b4998f7394b6b96d80f46c63a875
 DIST Test-Needs-0.002005.tar.gz 8505 BLAKE2B 783130e726a469e850541d1569ffff614ab38defb2a41df564f41a573e641986b9825963c22b8e7979db4fabc6f547adfe95741f83546afb46bce6e5249c2fc8 SHA512 b3023067d1f8726b0ae2162d0b3722193a3b56d12d5c207cf9558f1552ae8ab554773b843d00f1c481857c259fa869b8fdaf5a4838ab0768f38726ddec4130c6
 EBUILD Test-Needs-0.2.2.ebuild 524 BLAKE2B a514bc50ced7b1540e6321aebc0039d85e4774fc985cb43bf5f6f143a14d69ee209a0008ecfcadd19cf70c53b30f9d27301f479ed9d6143257e894dedf07a06a SHA512 b322da3975adf52815b5bc8c97b260cbe3dc9c791d4e7e33ed425988d32469862d9d0550b877e12e93f613ce31f55650403e1cc2579647b79142befc7afea7c9
-EBUILD Test-Needs-0.2.5.ebuild 528 BLAKE2B ace51aa0da07d8d29d031216290e528716c7b21d02ea53c38eaa81d8e41c736adca62917a2600fa4124cde86dca8007815ca587cf05f4c72fc44df9b24544849 SHA512 2a06eb565f2d555bcef06c4cea2ab41d5b02ef0e163754e3d91d95e016ff6d676882dec892c3835c09abd5096c57d26c384ae636f09edc7ac9ecafc7ce838894
+EBUILD Test-Needs-0.2.5.ebuild 524 BLAKE2B eefe6da872cbe1839d716a5cdc67e83286805781d2b00b1ce3d2e994e2a848fb1e8c128d6dc706d4f5bb0c28bc20e6e2c694c09281fd5868326429b524ade966 SHA512 e29fbec6ecdc9c2487851c8624f5eac780d18f5278a29aa2cf504673688365372767021932647ebf6ad854f567c9e8b1df486a0cbf676df0222533556a3af05f
 MISC metadata.xml 392 BLAKE2B ad442022b213e365a4894d39b8b49e9487e426e09f8ff1614bc17d8231932aa12077cf523305394836a36ffb0f1b1546f14e1c3d1084b8f3a2f1644a97f7dee2 SHA512 e958e6bb79542efe25d44fc5f87610d15342fc397e3be4829d137a6e6fbcbab06c558dc4034ba4de6c7a96b4f10137a57906a0278ecdcd782f60faaa6e3b4fd7
diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
index 33679bb122a7..4aa7a84873b8 100644
--- a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
+++ b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Skip tests when modules not available"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/TheSchwartz/Manifest b/dev-perl/TheSchwartz/Manifest
index d084785e3562..6d295e2fdb25 100644
--- a/dev-perl/TheSchwartz/Manifest
+++ b/dev-perl/TheSchwartz/Manifest
@@ -1,5 +1,5 @@
 AUX TheSchwartz-1.12-no-dot-inc.patch 8095 BLAKE2B d8c40697d7d2d10406672f7312b090dedfd97b33f86b76a879fe8b775f0ab0c00e71d1f9e4ba75733be16fefb3e1212d6c23739271bd476823c2b9ade8c3f8e8 SHA512 15e2b5ce6de9b3eb24997086266e515c2a6af480289529a15210b54e5478f11ebc960ec5f33d6b40c6654afd777e40a8ee765cf5d63ff48e7a80ad9aaa0a1e71
 DIST TheSchwartz-1.12.tar.gz 55047 BLAKE2B ebf7563203790dd1ecf7c026cefb2027bf1aa5e1af46200617625d48f6327338f08606ea47d21a474b35331eacd00b03c0924bfc9d28e6cc9f72fe5f96ca2007 SHA512 87c691c6aee0603a68d4116e9254308331974042d8578d6df086bc6f0f07783d757951f8c3a35227b9d716e94ccecbcea1f92ab488005384c2caf2ba9aecae59
-EBUILD TheSchwartz-1.120.0-r1.ebuild 470 BLAKE2B 26c1277b1f62b4270d31dff89e9dafb450a969627184b299eb56308ba7aba40784223de03b750118ca6b567945e84927430698aa8520cc91a5c63c4e125959c2 SHA512 0220abf4ba406341382f49bec0bcc138acd249a44a5597b63f934ac3704e8b2197a8d8867d79032882fceaca31722a12f1bd609fff54b7fca7085de3c1ffca45
+EBUILD TheSchwartz-1.120.0-r1.ebuild 468 BLAKE2B 865de268cd57439ff44116d9ddd9cdef909b24f0e4f1ab3e7276bee6f9acf8c47256a50166c16e3e51a656d7b71e48b4b9019b5b08aaef0f2ef79529087c86ae SHA512 933f58bde826691d6bb9496d64eb7217b05b858f277d96e87ea4aa1641d0fbe7d3b90910448c018540dc77f296a869a28368eb9e025288498b58ff6f263a9228
 EBUILD TheSchwartz-1.120.0.ebuild 364 BLAKE2B 421fabcbab69aa39757c5e9e68148c7fb3356bf08e37af9893d60e0033208ce7346b8ebc981dc11ee5efc8a27f62c50fbb11c4c0969a0aa161b11f71cdcb350c SHA512 e13174b0705104a1812066fef489d2d01d1269489237b434205b68097d7a84f7421264ca587b6778790f5fafc0adfd32ff48936de596fda27cd215ca3e37433f
 MISC metadata.xml 793 BLAKE2B 833d246051d0a4c1c094266028e4cbae7c462312f4535c885f6df3a83e6eecbebf378806076f4701f4e047e93812b84e75f591ee6968650baa681daa5d86177f SHA512 eeeebf27c8f69b20091c316ab7fe4e91f0ea335b8fd3da4db16638aa25c7cc5e77d66bca46287ad6f7a232918209b24a30350186c935beebf7624b6d93375344
diff --git a/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild b/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild
index 550daafbe4a3..89a4a378e57e 100644
--- a/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild
+++ b/dev-perl/TheSchwartz/TheSchwartz-1.120.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Reliable job queue"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Data-ObjectDriver-0.06"
diff --git a/dev-perl/TimeDate/Manifest b/dev-perl/TimeDate/Manifest
index 4544c67553c9..8d10b24ae900 100644
--- a/dev-perl/TimeDate/Manifest
+++ b/dev-perl/TimeDate/Manifest
@@ -1,3 +1,3 @@
 DIST TimeDate-2.30.tar.gz 31109 BLAKE2B a2e1001bfa0b531d3e6ff263c021b3d1784959e2b99a7cc31d028b8ec86971296b13bd40878b0e21f8e9bf37880ce23a864b894d80a3b7bb2f9ca0bd8e4c4830 SHA512 c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221
-EBUILD TimeDate-2.300.0.ebuild 445 BLAKE2B 00d4014a154e52097bff486ca646f316fe145b5def51eee3151d264898cafa08af2e7ce7fe955302ef840dd2abb2f951833a1ca6e18f53e3fbb6433a02b83629 SHA512 9f765fdce73e6ea6e8681b710f9d7e71166c76e31516bf1eb8828c81b0063401c7c9f510f42204bbd2a470d60944095cb1980c78390939d343d2d03f2af01acb
+EBUILD TimeDate-2.300.0.ebuild 456 BLAKE2B a760b5a357602756c9d66031cf1b2f71162dee481bd6722b7a3af85f2de63d6d9136330ffa9b0626ccfa14a980b146fdf8b33e6d7a2f60b451bad82e0725cbf6 SHA512 0597a213f5500a4176f5e8691c70001f17b10008d2722cd6f655d7db47ca22762068a4777630a7ebeb3ba946f99685f191e8598da5981c69822d2d6c3861d259
 MISC metadata.xml 2975 BLAKE2B bcd0bdbd824aa44edd4e13aa36f0afa7006b7c57fbbb4a9938fd8b9c05a0f698fab633b5e748597393d9f17b7a084e637ca8e85d0e6349713859a16aed0175ec SHA512 fce2ad579934da4f55ce9ecba2c69f57adc24fddc8def17769b4cebdc93aeca0197d4bd8b43dd95f8babbf5cb8eb39a49f3df4d7e40c967e1c87e4d961c5039f
diff --git a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
index cee2d2f111e0..a6364f9e056f 100644
--- a/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
+++ b/dev-perl/TimeDate/TimeDate-2.300.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="A Date/Time Parsing Perl Module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do
diff --git a/dev-perl/WWW-Form-UrlEncoded-XS/Manifest b/dev-perl/WWW-Form-UrlEncoded-XS/Manifest
index a3ef7df34f79..7925fccf59fe 100644
--- a/dev-perl/WWW-Form-UrlEncoded-XS/Manifest
+++ b/dev-perl/WWW-Form-UrlEncoded-XS/Manifest
@@ -1,3 +1,3 @@
 DIST WWW-Form-UrlEncoded-XS-0.24.tar.gz 58425 BLAKE2B 29c83510919d816d2d832ba52421070b127a80d7021e10eae0c6ceac10ff11abc35e9a2e56bc61d9b190526fa1b51af1b094b6131a536e5baf8be6068a7db094 SHA512 5b79821ac01cb9971b0884b877c4a35d15eebd7111c05720bfb9cb81cb99e39c86f33a8cf84f6bf10fbaad54d4b59a0d9ca1d242925d3ffd8fbb1e7b126ad6b9
-EBUILD WWW-Form-UrlEncoded-XS-0.240.0.ebuild 485 BLAKE2B 0fa37efe3e83465985593fd7ddce68b5cb41ade7362f15a02a3ab45f3cd20060a23aabe4ad90a01e507e056012049f90b57af576e72b9973ea88a34f28822f91 SHA512 9b25ca55e74cbe7277075be43577e4a5c1d6662e405a2ba03bc4a590584c9bec0020739a38b87098dc77c792a57e41700a843489c7bb3b4ec26e5c2196c8b189
+EBUILD WWW-Form-UrlEncoded-XS-0.240.0.ebuild 484 BLAKE2B 913520c6247b8a3b3aa1b80203fe287a38f4c3e366c7199c50fb66837d60a7b5bcad1618445496aab431ef03ab8fdbf14db4953439a711ec91fcf8b552ad9f3e SHA512 22792a6f1e1bdaef6f2f37cf956f7041e38105e11489029ed4577d078d882b6ee6f88d5854c27039b0bdcbeaf86db4a141e94b520ea1d5e29174459a52310038
 MISC metadata.xml 418 BLAKE2B 37910fd84653dd79edcc7b5610d4c2aa94087eab00dde76f10cc1f06c516cdf8531298d60474d7899f097d3c5bdf166261353b9886ad7293fca437d89716b4b4 SHA512 8777b91a9058d42e32059c48091e5c9a0f446f4a7f53208a1c0fc4691f5efcab69679f5b5ff50de9ba67295c02b05eb5b7b46133bac00d26a27ef875b5203da3
diff --git a/dev-perl/WWW-Form-UrlEncoded-XS/WWW-Form-UrlEncoded-XS-0.240.0.ebuild b/dev-perl/WWW-Form-UrlEncoded-XS/WWW-Form-UrlEncoded-XS-0.240.0.ebuild
index 3a94707a7367..593c7006f76d 100644
--- a/dev-perl/WWW-Form-UrlEncoded-XS/WWW-Form-UrlEncoded-XS-0.240.0.ebuild
+++ b/dev-perl/WWW-Form-UrlEncoded-XS/WWW-Form-UrlEncoded-XS-0.240.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="XS parsing/building of application/x-www-form-urlencoded"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/WWW-Form-UrlEncoded/Manifest b/dev-perl/WWW-Form-UrlEncoded/Manifest
index a1d814e6f207..d0ae04655143 100644
--- a/dev-perl/WWW-Form-UrlEncoded/Manifest
+++ b/dev-perl/WWW-Form-UrlEncoded/Manifest
@@ -1,3 +1,3 @@
 DIST WWW-Form-UrlEncoded-0.24.tar.gz 15060 BLAKE2B 38ca399ed60c87d1f0bddfc9f3df049143936955caf4bab03b9d383c58384627f1f5c3ddfb5caa8531d31fda31123eb9ffa7ec5f600424f7fe337fce45efc88e SHA512 57dfcccd059534d3d0cb2b1d8ee826e4a31e77920a43b72c5939a866de9d4b526e2f59411507c3287f8c7ae283f7ebeed07cda543f0d36663e6b155952cec63e
-EBUILD WWW-Form-UrlEncoded-0.240.0.ebuild 567 BLAKE2B b7f02495823cf6876b79a28ed0e3cf0c91c578d8c34d7882efda8b514827eb8dd90c6e1751daa8527e527820da3382302c46b31bae69ff32ac127a7e9ca0f31f SHA512 5b9ec564a29157a6e383510278169e5911f45015f1c3f66c2e83fe21bb1218ff68deaedacf98b8b35d77df94012ecd01e3a32ff44d922edd8fc61123189776ba
+EBUILD WWW-Form-UrlEncoded-0.240.0.ebuild 566 BLAKE2B 986153fbae434ab52b0ccfb9a714b1ff62a8aa21f66e4bce82f60725b715afd2fe493e203e7a9db32a9300b9287ae78d9117fb0081b8c0cd2dd1bf12db5ed716 SHA512 db0a989f2ac569f713a4af4c33619c2b4c480f03fb9304cc0f14b56fb50f364abb7f76234675229914817ce53dd598667fb31c0da4ce2926213a273cc3b36a39
 MISC metadata.xml 578 BLAKE2B 47fc4157ff4dc0575fe9119bd0fc0e9f191e3747a46a5870a07313e5c418c5fe84376e23b0fa7290d561d93f35d31ab4432ac38e3f5ec53dfa9d92505136192d SHA512 ddf40582f03a27c9ef8238ced6516c9d12e2f71f9ae1d8ed29121dcc60b83ce8cf38290c578a24925d6ff0448b9ca9c62670830d7eed540f1d3aa996b1292cc2
diff --git a/dev-perl/WWW-Form-UrlEncoded/WWW-Form-UrlEncoded-0.240.0.ebuild b/dev-perl/WWW-Form-UrlEncoded/WWW-Form-UrlEncoded-0.240.0.ebuild
index a00aa35dd432..0ac14b3b467d 100644
--- a/dev-perl/WWW-Form-UrlEncoded/WWW-Form-UrlEncoded-0.240.0.ebuild
+++ b/dev-perl/WWW-Form-UrlEncoded/WWW-Form-UrlEncoded-0.240.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 
 DESCRIPTION="parser and builder for application/x-www-form-urlencoded"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test +xs"
 
 RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 30f9beb7dd5a..b3cd695cdbc6 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 62f7178809d6..d2062f0d7e21 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,9 +1,11 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
 DIST apcu-5.1.10.tgz 111937 BLAKE2B 87bf86b43a775c38b232e4acd876f5c63628fc095747fecc26109fddc0473672180e3886dd613fa426772ea53aa8d7f46d08ec3e3383f6ce53be2f63a9ff066b SHA512 fdf82f2b46231849b373f50d1255bcedab8fbefa7ded7c157649cf6406fb593cc2f4e63ca7d3cecfbadb4533ecd8d0ad80e198626dc1489cea8a22ba87ca583a
+DIST apcu-5.1.11.tgz 105462 BLAKE2B 37ff632555e1bca51951db3021a4108a1de491b1bae2b12daed80e5d2d4651737cad744023c62956779395198accf33290c0c3b81b6abfc7bb54337a1a23e082 SHA512 2c284bbe84012030cc5c24ccf903c3abee995af549616c10211dbd5e463a5f37a3f27a5982127db81787a64345597a10be495380b844ce6204dc57c8b058bb88
 DIST apcu-5.1.8.tgz 111260 BLAKE2B eb41b1af33500ed9ddbbcb5e1a92884af4b356e16cf76c70f75a8853522cc91af1c156cc0bbd464fce539a138bf4e2ead5101810223b0f1bb91cd062850ef08e SHA512 4f377389e713bcae5534c64ea28f72c20ab2176aa758188c4d956c1f2370be49bc33dd2a1db43941fff5344a164aaeebc4e73e6d579f62d17334bcc520171526
 DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215e82757c457cc8938af48fea842e006c79c83deee4060cdc94047764930592eef03c5f347abeb7730897 SHA512 3e9b29a293b5bfb29283dd650907bfb9f31a1cb99ef908021d3869c3e3ae4051a2c45aab27275e90b0a2fa94c35cc9e170637dc539184d955f3f13dc09cba060
 EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
 EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
 EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-apcu
+			$(use_enable mmap apcu-mmap)
+			$(use_enable lock_pthreadrw apcu-rwlocks)
+			$(use_enable lock_spinlock apcu-spinlocks)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+
+		insinto /usr/share/php7/apcu
+		doins apc.php
+	fi
+}
+
+pkg_postinst() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		elog "The apc.php file shipped with this release of pecl-apcu was"
+		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog
+		elog "If you depend on the apc_* functions,"
+		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+		elog "provides backwards compatibility."
+	fi
+}
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index ee25e77fcbe6..d6a5b3ae955a 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,5 +1,3 @@
-DIST eio-2.0.1.tgz 73968 BLAKE2B 226c35b9fd8e924e9fa1c4d199e43de5b63a1311bcda2e2aadee46beeb5e983e06adf39c001cb5951471b229e7136bdd5de0e37b76ab3cb0df8188f6463281bb SHA512 29a85d4eec658003432ff3e5e84d58a3c4aaeb9724d88ca7941e35856dd2f498ae37223c929b4f7012eac69576b40bf88fb0c2e45f850af04bfefa2140d7d593
 DIST eio-2.0.2.tgz 74005 BLAKE2B e09f540753f2c607b95de9c3f390fc0c31ad2a34fda99aac86f057b2e664e49aded0b5f3e491138af60d00828ee9ff13f09958177e9cfed2b254473b1f814da9 SHA512 9b5ab80e6a76a1a2e99dfa641b404d0b52cd79b54267a8ded622930b4cc99f3ba1e39a70fc2d8f5c4ed50fbd67d97bc78655cd17958f0c8a2314b3b6ac1c6384
-EBUILD pecl-eio-2.0.1.ebuild 491 BLAKE2B 4eeca89ab6c6dd8b5c1aff65869d90d5ad637c68c77a1a525de750089810390630334446a68c2eeb0478743bd7fd84b513bb02e55f7a8df34a0eae4ac44f78a8 SHA512 aa465f06035006f71a5ee95ad1f6963bae783dad22f322d048553e7caabc07867ab7d8f0b4fef380d0c486161de8c5ef541c9d82765fb63f60b870d694cd84e7
-EBUILD pecl-eio-2.0.2.ebuild 498 BLAKE2B c8ab34a2e4de3e6abad7fe02ffd00c2f823b33f206acecc5589d9e87c248fc4fadaba673ea23702155e89ab9a979ebb8b1d60b9e86016def43b345fed7c23ef0 SHA512 4d751c75001bbcf059ef735acbb34ec075e21d120b4e8ff28dab862aac811faff66f6e506fd593aa33195dba7262906e2b10d3f82a5292660c098202d468c400
+EBUILD pecl-eio-2.0.2-r1.ebuild 505 BLAKE2B a111e8ec1dee97e11e0766490b8fb320c529e2abf862f3c8466eddec45a2102d751a091cfa88f8242491d2d8178b23d96b6ce1ed1c36624560b9844ba7d64325 SHA512 a0444dcecf3ee753e82d6ee3b3463e5fa56bd484a01d120b3827010f43ea09ee2c50babce2cb072c8b14d5f1b1e62fbfd0155f1aca3de7168e18c46716c549de
 MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.1.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
index 1238529e7ff1..ed19c8deb059 100644
--- a/dev-php/pecl-eio/pecl-eio-2.0.1.ebuild
+++ b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 inherit php-ext-pecl-r3
 
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild
deleted file mode 100644
index b8ac4e39c798..000000000000
--- a/dev-php/pecl-eio/pecl-eio-2.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="eio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README.md )
-
-USE_PHP="php5-6 php7-0 php7-1"
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="PHP-3.01"
-
-DESCRIPTION="PHP wrapper for libeio library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="debug"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS="--with-eio $(use_enable debug eio-debug)"
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index b40ce9698050..e56e4d427003 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
 DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
 DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
 EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e
-EBUILD pecl-event-2.3.0.ebuild 1026 BLAKE2B 509a0bd80c90f4377f9d860e14c4b708de41c7f112a2c3634bcff60c377c203bb5c6e1a811f1fde3b3bd86e86d3f6f35f5e85203c87f7087e95acabdf95d9c5f SHA512 10b39a9e4d9502356c17987c540674c9a484dc3bff01f7870b231f4ca27c528ecf5f80bd39f8d4fae06a5da2a53615d7a6cf8e384f4ccf243f8e29b52301dafa
+EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/pecl-event-2.3.0.ebuild b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
index 47dedd109882..3fbf4fc20ca4 100644
--- a/dev-php/pecl-event/pecl-event-2.3.0.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README.md )
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
@@ -24,7 +24,8 @@ DEPEND="
 	ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 	php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
 	php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
-	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )"
+	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )"
 
 RDEPEND="${DEPEND} !dev-php/pecl-libevent"
 
@@ -41,3 +42,11 @@ src_configure() {
 	)
 	php-ext-source-r3_src_configure
 }
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index aeea2dc7031b..a6b21761db49 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,5 +1,6 @@
 DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
 DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
 EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1102 BLAKE2B e2d3415cdf18b60b438eb722965ce005f2eff5a369b2852130f8327371ee8a8ca116c45019c6cc7c3352adca1c270f3e05ab8397b08093cac7b9e9b6133f2c65 SHA512 1abb3679ff2b75393541481a09d5652d4e17a517e1e98e916882f1081906761b66a9469e0971506b4985d1eb22c6c0c033df8c5f8314ab0dabce76858c7ade9e
 EBUILD pecl-mailparse-3.0.2.ebuild 1070 BLAKE2B ed243cc104739cca574ff091ac1ff0722e7971a05cf9fb42cc5f6592d0f6363b1f73382cf61b3181e91c7bf7f441c702e946b787749b784648c4c8c548dd2f8a SHA512 69b0b8ded36c21069f5aa10244288526af79a3afb7b24044e1ac50fc7888158c7ca6e1d6cd247c207a3c0a43892d65ea6826f579acb74fe36f4a05ed05e13d11
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..9b37d88dcd95
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+DOCS=( README )
+
+USE_PHP="php7-0 php7-1 php5-6 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+PHPUSEDEPEND="
+	php_targets_php7-0? ( dev-lang/php:7.0[unicode] )
+	php_targets_php7-1? ( dev-lang/php:7.1[unicode] )
+	php_targets_php7-2? ( dev-lang/php:7.2[unicode] )
+"
+DEPEND="${PHPUSEDEPEND}
+	dev-util/re2c"
+RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index 23e34b8e910b..ec6fcaf766e7 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -4,5 +4,5 @@ AUX 2.0.2-compare_segfault.patch 1664 BLAKE2B 099aa3f78002d734306673d817e21d75bc
 DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1
 DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d
 EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 BLAKE2B ccab8eb759914ca9d30e73e8d23a829f3ab0ef120f7c9ecd70466f16658ef8e02763ffb64ed33b7cb4b797c3dbbbb9e3980bc93e3bb08d349dda02930545a48b SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d
-EBUILD pecl-oauth-2.0.2-r1.ebuild 1221 BLAKE2B be1ba9746bc0039ff605b57b5ebf6e20cd22c8df0d5d563d0ac779a15a33bd1ac505a6f8a4a2303880ff62a80b14a52c5604d3b31ed859209818647e6f55401e SHA512 c6db693818ed1aafdaed549fac541679b19732fdb64e5d5c0214a3e29fb2763cc5dfed2c02b0260550f5df2925b2ce1fbde467c50f756583b1a31ab975e14cbd
+EBUILD pecl-oauth-2.0.2-r2.ebuild 1407 BLAKE2B f048f3a75f5511e0ef9efc9a5e0428f0d30ae98e3ffb3664b417a87e9725f6db34ac9b959cad9b12941962849f03199525022d119d768722769340ecfaa92567 SHA512 08f2136c40fbe88a7ca94a27ca09ccd8fcac6a0367c32a28272b472243ff036192202adec19bb401b7274c65e2b1eb63911a07ab5ca76741d15b0e24a937aaa8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
index 988ba351a82a..987a87b85ee0 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r1.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,12 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
 # Really only build for 7.0
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,11 +24,13 @@ DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash]
 		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
 	php_targets_php7-1? ( dev-lang/php:7.1[hash]
 		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash]
+		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
 "
 RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6(-)?] )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
 		local PATCHES=( "${FILESDIR}/${PV}-compare_segfault.patch" )
 		php-ext-source-r3_src_prepare
 	else
@@ -37,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
 		local PHP_EXT_ECONF_ARGS=(
 			--enable-oauth
 			$(use_with curl)
@@ -48,7 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
 		php-ext-pecl-r3_src_install
 	fi
 }
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 5c99ed54a3c2..180f799718d3 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,7 @@
 DIST redis-3.1.2.tgz 199041 BLAKE2B a90f4136dae03155d7e3fc4e5b6b32ab73c918a850c501a19e28ea62c6d105108ebd18edaa3b12a13cf38103302ee6ad0759a47b4c59e4a5464e951f02cff0ea SHA512 14b6321072f8ab41b8293b40ea8e1e2bdac1bb694c4566467ea4e6ced37c8fc41bf5712bd27cebf509f25fda0492765cd2c8d2fe61395bcb0b0d9cbbceebe684
 DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
+DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
 EBUILD pecl-redis-3.1.2.ebuild 1278 BLAKE2B 2ddaef2935d542e2cc7e0d4b9779d0798392e484026ce1bd8bcb90c46c1e126a444645abd01c7d8130ce958a86e68ace3716c1b889e80e3f2965da7e6f968b9e SHA512 4b0c20afb075ec39ba1ec4964d2cce9a892e4a99b1c7b2fef68fcac4fccf0c5e570535655a041fafac66617f4aa77dbd1ffa5381aa8fe73220c0c68a01f3eeff
 EBUILD pecl-redis-3.1.6.ebuild 1354 BLAKE2B b7507247b178bfd5dc5d02c7c9c7b7626b4823e89790f3ef87b465d41dd9135d89af196b086c626be17382be12d606c2bc0d2d819e2cfa21609320843e6c6566 SHA512 63295ee715d3ead98beffc237de5fa7e5be713bc2b68934f306caacddd6c77ac0d54dd318a6abc58cef0f5ce60af88482a35332ffe6f981cda58a43d3914fe4b
+EBUILD pecl-redis-4.0.0.ebuild 1487 BLAKE2B 79c0f93c8f7444e09149375e4756a37f03e8b0e217257849c4e8ed53af01ab6d418aad874dd74cd3cbe1373f677047e375f6952f3238e84aceff9b94b1d48def SHA512 e935943dd73dab9ac5ad65e1021cc67f08e8a01b186c183837426708282e044535a8716a8d9264e345125809f9b9d891166f9597c5892949796fc81e6dd80ffd
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild
new file mode 100644
index 000000000000..af4fb3636c09
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +session"
+
+DEPEND="igbinary? (
+	php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] )
+	php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] )
+	php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] )
+	php_targets_php7-2? ( dev-php/igbinary[php_targets_php7-2] ) ) "
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable session redis-session)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test(){
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
+
+pkg_postinst() {
+	elog "This version comes with breaking API changes."
+	elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 52060f2ab5d6..1df13739c55b 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1,5 +1,5 @@
 DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242
 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
 EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd
-EBUILD pecl-rrd-2.0.1-r2.ebuild 891 BLAKE2B b38a40b844bdd4199b9117e50a1113de9a0cffd66d7d59d1dc35b2778693f6f5abad8ee9ed7e09bb08e4bbb48a3a50a43a892690c522120a03930d41837db554 SHA512 f05bcb413e2442c372a65df296fb4d56f3cd15f7c9c112348ac7e4e25edef717c5a8b7fe4e3092b7ff5880753d7cb0c1c1cb594640db7296005b70ff3950bff2
+EBUILD pecl-rrd-2.0.1-r3.ebuild 1367 BLAKE2B 2ac6444ff160545e5ce4635337729ba95dc98304a70b22c9347d7fb0042b863c5af6f572391450ea2cff1cf965d24be122a23a3627a93f42d54bdb4374ab50a5 SHA512 7f5a17ce552a015eeb4a4ca9cb1d1203dff03ad49ce6f592e674a8eaf82d10e407cba1e0a7566d3178c720232686e8a60be06b78d3b504e3f943e0b95c7311b0
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
deleted file mode 100644
index 08528ee02abb..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Define 5.6 here to have the {,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-0 php7-1"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=()
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..8a4100b18f95
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here to have the {I,REQUIRED_}USE generated
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# But we really only build 7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
+	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		local PHP_EXT_ECONF_ARGS=()
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	local slot
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+		for slot in $(php_get_slots); do
+			php_init_slot_env "${slot}"
+			# Prepare test data
+			emake -C tests/data all
+			NO_INTERACTION="yes" emake test
+		done
+	fi
+}
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 0bc6a73b7cdd..82e52dddb9fa 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,7 +1,5 @@
 DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
-DIST stomp-2.0.0.tgz 23422 BLAKE2B bff7aec9c59c0d812f00a8e6ba7beedb2c484b5b4337949c5463a97f8743f303633448706907eb076a1c1c40a0bc3911515f5236383444f387ec385631f1938b SHA512 f999762f842f19e920bca35175e65e20173c9ef5162eba3b79a7a2a70a52991c5d39f6d9dd6d9dfa081f1c2fb23e0dae5fa42224dcad4626666e5785076f1a12
 DIST stomp-2.0.1.tgz 23494 BLAKE2B 3e9f042ffa4a8f54a0746db638ade4bf75febad0359e398894714c6c4d4b6bbaee65cfa384c379d14387026219f02013c6dbb7faba62ae11b4231215be7310ad SHA512 61cfacbd96f1061dc869ede6c1ca0f7bceb6120b28cc4a78fabcbace54a66ba540faf41ef72747b8bcc6a4ef98e405daac04e82bd4e079d90293f030684b04d3
 EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
-EBUILD pecl-stomp-2.0.0-r1.ebuild 895 BLAKE2B 76d75e39fc00bdc46f543b28b4dd57b12aee6f19cc4bc0de4b175cb06693cf343151c3e3bf6628b35d08139f14061c00da0f3f5cf852fe6a49d14c5fa497f5dd SHA512 5dfdf66f63742e99621627998dacea5b4b2402b07897554cf7247639a5bd1d18f6c6cb05084022c8d153e66e7f3cda40f137b773a6292a114fcff04caac83751
-EBUILD pecl-stomp-2.0.1.ebuild 1009 BLAKE2B 4b36a0e7d9dabcb38ea2693be0f4fde1ac74624bacc80d4c60d918ad7e3a9406d4ea82013027ab264c6e875cad1f8f8a9f192d30eddfa9a904eda67873dc3e0c SHA512 6ddb73ac506c635ddaf072302fb5e8eaadd059b540fae0621831626e68923862bf3538d981fbc6c421a8d02b9852ba6d923cbb7f412d47aee33c807016015bbe
+EBUILD pecl-stomp-2.0.1-r1.ebuild 1206 BLAKE2B 4bf5f2d2003a7cd3799218dbfd4025c88fcecfff01ef365a75250aea5a35a7fe21beb7b0e060b4b01897c0bb0c685718902d817c68d60678e241d37dec11b62d SHA512 45d183ed424595af9de5a600e1fdcc9faf4246a2779b6d25040684c2bd6db0ff296a1e6677099350936dda1fe427822deb7bcb16574e5804b19fb4672d452bc9
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
deleted file mode 100644
index 67d853f1c4e4..000000000000
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-0"
-PHP_EXT_NAME="stomp"
-DOCS=( CREDITS doc/classes.php doc/functions.php )
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to communicate with Stomp message brokers"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="examples ssl test"
-
-DEPEND="${DEPEND}
-	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
-"
-
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
-
-src_prepare() {
-	if use php_targets_php7-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	if use php_targets_php7-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
index a5a0477007f3..dc494fe74045 100644
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.1.ebuild
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 PHP_EXT_NAME="stomp"
 DOCS=( CREDITS doc/classes.php doc/functions.php )
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -21,29 +21,32 @@ IUSE="examples ssl test"
 DEPEND="${DEPEND}
 	php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
 	php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
+	php_targets_php7-2? ( dev-lang/php:7.1[ssl?] )
 "
 
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
 		php-ext-source-r3_src_prepare
 	else
-		default_src_prepare
+		default
 	fi
 }
 
 src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-stomp
-		--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
-	)
-	php-ext-source-r3_src_configure
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-stomp
+			--with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+		)
+		php-ext-source-r3_src_configure
+	fi
 }
 
 src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
 		php-ext-pecl-r3_src_install
 	fi
 }
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 86d6c5eafdfb..43d751293ed6 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,5 +1,5 @@
 DIST yaz-1.2.1.tgz 20147 BLAKE2B fa6c4b8d8d55ff734093950d1ddd2f24375aacce9d34e52680925874dafed5b0be769cb5768f02d89af573c7a1d5f1aa8290bff2cbd1c8a23a5de011bebd930a SHA512 92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1
 DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5 SHA512 cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
 EBUILD pecl-yaz-1.2.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
-EBUILD pecl-yaz-1.2.2.ebuild 534 BLAKE2B 3b5070ff3af1cd7d9d22a13db0617dd273b160bcaa838b5a5801879324c4c67974119cb4b9d5f9b318229bc9bae2bfd9118c80eddbdcc5f015b1672003ea12dd SHA512 e9d1b8233d6f28c3ff17320cd9ff35b1d0393b6ca55b5bd912982c8cdec60de820e508c3b91906ab0d2dda055f9139a7babe8fab1e4877d36f5a2f15f9fada60
+EBUILD pecl-yaz-1.2.2-r1.ebuild 541 BLAKE2B 0e232da1bc871c8a77fa6256e5ab6e6d7670ceba6fb78e7b9d4aa07ec9b239727c7ceb8b8792f1321d94384854fc9ce438c5039619686a978bf112227f53c6e5 SHA512 93e618f7415e8785799215fd4222870167a90b306a632e5a5ee7bc7e59b8dca8b0eaecab56d70572f474c6bcc275d96e3357d4f40208345b3724a6530bc4b603
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
index 8c86ba44950b..aa7a51a8b8ad 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.2.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( README )
 
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..70d214cb4144
--- /dev/null
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 66836f7af81b..d4ecba1a91d6 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,5 +1,6 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
 DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 EBUILD Babel-2.5.0.ebuild 1477 BLAKE2B 340f4e488117ed48288f9d842ec23b9fbd70294bfd471a4fec68d1fade530c8455435280d11b201307cd98e8300d46f544448cb7bf399cc70a439009a9aa8e16 SHA512 db072a3022bf1558201853cddc02a7b0614ffdd474a467fb4d819f7dcde5fcdd227dd37a65205b530bee715ebbd16dcbd0ac00af8b5759e52ab63def0b9948c6
+EBUILD Babel-2.5.3-r1.ebuild 1528 BLAKE2B 543f0e06a57ccba2d069b4eb4b89412c01098ec467be3c894238e4627c77b3b444cef2abb41adc4f9ffa5a8b63d4739843d7e6501f6bab89d300c75f7466c666 SHA512 552301531114bc906245919d1ed8639288d3b3af9ac384358e2b401524ceb231a8eb3b8017cea371affe48d901939ed11666ab1faf137bb74f2106e2f5919976
 EBUILD Babel-2.5.3.ebuild 1478 BLAKE2B 78ac9ba8239fc1d6da3981d3a7e50e51c8e229ffe71578e71da5ac6c1634b710aa65cee0ca547a17a1f46ad491def4bf40afa60eff62ac6d4b1e05850e24b2a3 SHA512 7c5137bcc60576c5c8227a958cc8640924fa3f56bc66b7387d1c7b8e7a2be0157595f2803500a0ee37cb34a48f92dc40c26cc455562ae6041cd67ac939b4c0af
 MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d37cb47475c0..5cb69dc39844 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 8bd7b73551e1..5685b4d8196e 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,3 +1,3 @@
 DIST PySocks-1.6.7.tar.gz 282874 BLAKE2B 9e4ecf57f6cb9b7690ba68e21b3e52a535a08490b78ad5d8bd90384acf26f16e6a08018eaa7e91763b94182119217404b235425fce146af7e989c5e39e5e07dc SHA512 e49ce2f4ce23fd84ce30a62a5585af3c63980db46e7d427571d8fb8f6b85f4b6aeb37066863491496dd322555a5ce261123d613b8e5819dbdcef8a4e17e5dca0
-EBUILD PySocks-1.6.7.ebuild 587 BLAKE2B f0894ac1e13ee166449a415262dea41c3a7867057c67a284ab458cc0e071172a13b1a15e12e9598d4a879697f96f46e561c14c4beefcd43a367866cae8afdef8 SHA512 3c01c13e2142db0f6dceeb8afdb6595d9bf2da1a4ddffef5905004dc974b37ec0b5335a4c2ca2051827dc49a7c5155867b2a0b9e01f3095e5140d74a5ec78a04
+EBUILD PySocks-1.6.7.ebuild 598 BLAKE2B a26cd6f2cf1fd6106cb3a4c26f4452ad97a17b09aa8ba6bafa35feb65235878fd1c0131d9ca122a0e450a9a9a824ecfe4880b770adf778d0b71a84d6d7ef3693 SHA512 1b2d46f103fe4c8840a6d330b9107814dafea1bfa5270c624b6a07f18d288212884c614dcc05774b197854244ee58baf18db9d1c55c6cff4446ab4c4e85e9426
 MISC metadata.xml 499 BLAKE2B 6eeb0c4905d8f0d6c2d276b36a74ac9e1aaf3f5066ba79ea3b821fa31440a46c4ba49f88be096850032cf8598f6abee09182d84a35345fa53e1001a05137dbe0 SHA512 ec9cc3e4f9a050f78cb0c073efd3698b47aee2ce14d438163b5037509a5d8076509b4954bec0afc7f1e05bc790f26a6a520bb671b1c8590db966456dcf53b9aa
diff --git a/dev-python/PySocks/PySocks-1.6.7.ebuild b/dev-python/PySocks/PySocks-1.6.7.ebuild
index f10a2f7d2a48..66fb0ebc9608 100644
--- a/dev-python/PySocks/PySocks-1.6.7.ebuild
+++ b/dev-python/PySocks/PySocks-1.6.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index c0f60a3c796e..287685f9a6d8 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.22.0.tar.gz 84508 BLAKE2B 5f21e13e6af0f5edf6f79454654e677182e2ae06a36d3f86a641e76e5043f8818fd17dbce40a8b0c4070a254fdd169a3eada99434f3b9e4097d4c106a774c30c SHA512 fdc98f71ec3b744e69a75909b5b0a8381fb82d448941a6e1059823af47ca107218e1dbe6ff192e2173f11fc2454be1afcd387d801dc8e716451179857d71f8b8
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 EBUILD asn1crypto-0.22.0.ebuild 610 BLAKE2B 562ffe89a03cd014c14fc4dc9bfc453fd24a3a5fc910fad1a70cabbcac24445211bc1b6eaeef8211642c58ba820308dd9396e820fd9905d80cd02549669fef54 SHA512 c99ccbc6fd5f5b4d6c0c87d4332580e0190de21789cb82b99eda16a9a741beb5d37e6489a469fd46bff693bc1313822cc1a4e2281d99bcc509534a70f6752f64
-EBUILD asn1crypto-0.24.0.ebuild 747 BLAKE2B b7a08e7b15d648696d79a537b2d0243fac0210ae004a974509e0eff62e1ce26cf9b08bfe3892bc6b18eb3e3820647e286ec89052da986dbe9407c294ef0abb20 SHA512 495ad0b3e7dbb21fd4168cb19cace3aa51cb44fde0eb7101a4f600349fcbda89eaf93ed58e2a0ee4b2177f5cb5d111182bb91b88cebaa145f361fc6ad805ca9a
+EBUILD asn1crypto-0.24.0.ebuild 758 BLAKE2B 9bb167c6d385519f3a12568363ae1064dd132ccbef4eab85f5e623313869d6d1cd1add77c99f1b3a1a0dd32e9f9b5131eeb0bff829abb0fc03602af498d60b7b SHA512 b1662e350659fdf6b3cee56fa1073ffff682904e75a78810ab5417e0f79c1da9f7e8c1f593c560123cf5ea0dbad55c86f128d9250432b3298ff0a01b8561ee46
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index 7447491c7a35..79303fab0a2d 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/atom/Manifest b/dev-python/atom/Manifest
index b1bc5c32a77d..9b9fbd595631 100644
--- a/dev-python/atom/Manifest
+++ b/dev-python/atom/Manifest
@@ -1,3 +1,5 @@
 DIST atom-0.3.10.zip 102102 BLAKE2B ed67aac137ed1ec983d45296756a6cd716201f412783287e2c054edae1d4ac25923fa53af832d77e5ec2c9ce4ee064d2be8013526e41b679235e5eeacccbf39f SHA512 ae22747f96e42b9cc4f7c92ddb7d7b8af647e17b917481cd267d4162bd9260b906a019a73de2ca6e3c72a9430dacd535001da7dcb809c1c3dc18c7297be14b76
+DIST atom-0.4.1.tar.gz 65082 BLAKE2B 9f2f1fe4a910e69a083567472d1d442570b922e1aafd3a94ec55541b406d7fa876a5260193137f9de37b1c44fd97f95d0868fd345cc82e0c1c73683c149aa2e7 SHA512 95c5b5a78fb8466a78b8f983290e722d7f797ecbd9d149e37f2f52f0604c932bb747c791a4d16922535e0ef2c992c59021c2f695563d5a320a86538a6a80b958
 EBUILD atom-0.3.10.ebuild 1235 BLAKE2B a5aa1017a34efe216ccb522eda69aaf2d06e427fb4e846fb27b325a506aedbf768407f0f7894ad4452c067d44a39024fe47fd808b9e4422b6178a842215e698e SHA512 364b84a9c1a310efea4b5d996e7cf521589a2a0c4f66c78d4c1c20d5085657156d16f932dd9dee795145347d4b7bfd62024ee85a2402f12c7415387fbe36ef40
+EBUILD atom-0.4.1.ebuild 714 BLAKE2B 92fb9915ede9a488a4fec6e1e49d2b95d28ab6a83c268f5fc6a56fa1b51d104ca6753c2a63ca4b40eeae031dc190eac86ebe26668f5a29330b864eee886dcccf SHA512 19a37c00e41ae67e68a40cc8e6a2ee3af534a99cf7616c7663e9ed4f69e8e75b1ebf6fda7daf07ac09d25cf222c37376dc130cfa6b97552ef442c24b97879703
 MISC metadata.xml 371 BLAKE2B 713d6d3b8890c79552ca16e91f29a485e477dac4f89b15c45a5346d97672381b6ef8c5903e659991c24378c8cf14b58381f3a0f3dfaaae6e2fc0754de83da428 SHA512 1914ed5cf60c1815a0bd9639e7af0a85b6dc2bf9952cb0ad00e69fd3e3a529a0fa6215079f8ca56b1fda49d36f34190a4c011afe41b11d81d0bb58e0674e466e
diff --git a/dev-python/atom/atom-0.4.1.ebuild b/dev-python/atom/atom-0.4.1.ebuild
new file mode 100644
index 000000000000..a58ad5387d5a
--- /dev/null
+++ b/dev-python/atom/atom-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Memory efficient Python objects"
+HOMEPAGE="https://github.com/nucleic/atom"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 702769af1d4d..a30c75cfe737 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,5 +1,5 @@
 DIST Automat-0.5.0.tar.gz 32599 BLAKE2B 951da8840c2334fe3cd86804b39beedaad0d344d66742e8bb72e2d2ace2029b037acac8ffccc5643fd37f81020a567374a25ed42f7bc386770a30956464f52eb SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb
 DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b91f5f3e29bdc47ace443af8de0fbeacf1657dc6565b3ab824365362a42204d6d89a8dfc82eaa6cd92d4e2308 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d
 EBUILD automat-0.5.0.ebuild 1220 BLAKE2B 8e726d510b7f57edf5da4597fe46c82535a529a63344236ec564d848338f21d9b9c9cdf71c4deebab05e0382c8f8f6005277162aec40eb02ebe192392e6aeab9 SHA512 f2b450072264f07c495995fb022d44bfa38a589ee184f15d6305efad1c7ecef9d965931aab5b9c0959a184458a028a9d407182e307f2297d2483d6ff4eb534de
-EBUILD automat-0.6.0.ebuild 1232 BLAKE2B aa55d59a0679ef43110c031109e66e7a02653b3e0885200c7a7966fa01c42bd84dfeee72dc1c84e1cf0a85fbf78c608496a5f23585192113761da419776baec3 SHA512 53954f1c703bbd4a1a3746bc29a68ab769f2a3d4c8f23f5d5fba16ab71be14a27df39d23c4adf6db10304cd9b45cdcfb78e87b1889eafe98162688b2298d6e0f
+EBUILD automat-0.6.0.ebuild 1238 BLAKE2B 19ebbe551b9079e2303d90092f91cf4e70065070eab18203216169f7e3ce7b21764e69889e33ca75b993096b89e12dfaa72f9838be2d7cf81bb2e7e81246ed4c SHA512 88bc7cf7b6c51a44d137812292e5aaf4498bf46a24b3514cee60ace255c311a232e082f1d42399b5dcc6e5b6b7e5d6ff8fefe05f9e6f91c352151313426a3c14
 MISC metadata.xml 622 BLAKE2B 10fa7f62095186a07a588b374c55dc084a483ff8848caff3322822964d57175a729e82948f984f4348a1cd0e5d7bc08c1d548ef674fb93aa08bd55343c53ba63 SHA512 f9feb6bd4b545a707d0539d42d20a0371eeb8a9e0984e922b3a0416a0dda97b6783c21cf1ec63868c200535d9a46e80b820424a1d7199074419780b3e7328333
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index 54285ae3dda8..f9c1a0275999 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="examples test"
 
 RDEPEND="
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 9eb46b68fd25..8eb8ebaa0882 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.6.tar.gz 34475 BLAKE2B 9249684972b2496cfc5652d4dea5d03e0cf14fbef4a6f617111210e0125d0f455db2b80cdad5640ad71d04fe23fa292ea50a2083125daae5023512e577553683 SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b
 DIST backports.lzma-0.0.8.tar.gz 36111 BLAKE2B 1acbe9628f740f067068cc07105abe2a161bd2ebc712f1967c54d814abfa432cf5394167cc7adfcde49cc54adecb792a84e91ae810ad150ef38a22b2e79f9440 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad
-EBUILD backports-lzma-0.0.10.ebuild 1051 BLAKE2B de2785972f560ee1f98f9a327dc414315c90361da8962735c9077819f3c81f95417884a285144cbbfde154a45daccd5fd6c67bf23d0d301094b9816a78e8aab5 SHA512 b1afd10c7dbd882a0f9da7d153bb177a1e3971e47278cd6cd187bbff679e28f73034652fb7b73d47cf4396b10ee59434ac65824033cd4ad179c1739380a5034f
+EBUILD backports-lzma-0.0.10.ebuild 1062 BLAKE2B 13aea8a3f4be98b5413c55e4e7507b15a8ff2d3915328c635288632c74f72f765dbad8f9d6cffc90ee856b58600724bf1d0ff2276a8bc213432c1428cf5d43de SHA512 7b76b1fd599a9f06a960f84a0ec2d6c73b8895eb82be098c2f4b49d2a5fb2f9dd78e67c7ff8f81da64276c05de5f9e3121faf5ac196a40ee035a3bbaad7d1a9d
 EBUILD backports-lzma-0.0.6.ebuild 930 BLAKE2B 3caa188c2c895f9d56ea35820a1697c922c0f420653db35ceb17ca7c81bc333bf639d969cebe6d7658d1a9259d45f5f64fab15ccefc208c845014958e46a8aec SHA512 21d6fcaf62639d5109f0531eb5b675b7ace6bea85a9ec5d4a7eb9c1df3e9bb92734350126b481c83a755f2f130421b64f4c2f510b6decd37600ad6a3c3b2ac90
-EBUILD backports-lzma-0.0.8.ebuild 981 BLAKE2B f7d11acae1ca5b0bf3b999ff7780cc1a96f0407badeaef2adc770ddb9410c2b4803cbf178b42393911d4e5227794e5d583d64cdadd8b7f693455be01c440acdc SHA512 ee9e5d5a7bdc1d8f3619b9b4ed3871b357e6aae85714c955938dfb3e8e82aa6565eda5bddcf9dac1be52cf402594f16151326a0f5ee004cc04cade87681ada5a
+EBUILD backports-lzma-0.0.8.ebuild 992 BLAKE2B ad7f04d62e8d900a6b8cde01df214d775368f430f5ce6b5858594df80048c12a832131bd098fffc56cf14e88b0743d8169e6c3b227e23b301bb53c7754452f73 SHA512 399a25812088440242ca68f9aa5df3e86539269e0c100082259831b97047d270443a0d416ce0bb10ee870874bdffa6ac53e3912b76ef63234949e3f15cc8a7c5
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 6b47b7777791..04e71a2f6bb3 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND="app-arch/xz-utils:0=
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index b8a0569c4946..3672e2232c4f 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="app-arch/xz-utils
 	dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 76a0ed1dfbfb..8e8cb157577c 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -3,5 +3,5 @@ DIST cryptography-2.0.2.tar.gz 427303 BLAKE2B 53f891c02aa4b82b13a66a4c74bd6db9e8
 DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a333b38b71828c71cb7891b489ef7af60f5e5590f67b43d5e63dc2279d9ca1ba036879f3145264f7639d65000958b50 SHA512 f749cb4384badc174a842514e5a4fee2ed01ab9c716799d8d9d5301f6d2d97b6c41deb9e425f48928b639fa34bef8c05529ed7e5b777ef5ca75c244f8fda8fd4
 EBUILD cryptography-1.7.1.ebuild 1666 BLAKE2B b474878fa899bf532dc628455180463f8068d4ce90a3d0f91f6367aef1eaa5f9dc9027496bb2ccc1c9bd9451b00ae0e713c92a4e0fe156b68ae209fb5befb14a SHA512 d30f513b2b76fb1fa100b9c9a06adf3330e66f6fcc18ca62d01dc493fa70aa6e84e6cc902e0d2d537d456c8fe8b963b25142bedd5d1185d476c032d0c50b7950
 EBUILD cryptography-2.0.2-r1.ebuild 1625 BLAKE2B 8ad8cec1c8e8d005b954afa1657cb28691f3a8718009b38834fe5eff5fd04e6827694f65ae266ef544b7ddbad2e2c4ef3d9f4cf300ca4ecd5c4eb1b479b5ec88 SHA512 5ab761262bbdae17ee75b54b5c02a295df4ee0d2b6c4a33c6371b99a20c565d0e8dd6a9cd857e474b782dec9759188b046bd354a5f65a1f9946e426fb23b4e60
-EBUILD cryptography-2.1.4.ebuild 2043 BLAKE2B 67f4cf052320fcd719840fcb9082d882ec1d5c229236a80a82e9d7c2e59668fc8545edf14c256ab9714ab4d30a5d0b5f4dd418227e3642487fed303db0e0ef60 SHA512 47615b57a1a4d94453f71843f5b5cf3481a90ad6b4283fcee14879bf1e117d65db769494b374049a309f457bfdffd463dae0c2440e15da31d74780f2f66ec2db
+EBUILD cryptography-2.1.4.ebuild 2054 BLAKE2B 3ed17aad90956150831f5831708a73cbce2537b1ad0ac96130c30041a513b60a0bf508ecd04fe563ad0b5cb20bddb6de8cca9870deac8b30a7ba76d7573ed046 SHA512 12ecf36d4124e39d50a602c8910f6f243e87301d2cda588a979a4f1841dcb73ce6204901ca7d42138880f4c5e99ef9f499f873ffc183beb8474393158a07787c
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4.ebuild b/dev-python/cryptography/cryptography-2.1.4.ebuild
index 293255548bcc..67a90055c078 100644
--- a/dev-python/cryptography/cryptography-2.1.4.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 7726f978e3b9..15283753f2c7 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,5 +1,5 @@
 DIST discogs-client-2.0.2.tar.gz 25486 BLAKE2B f901628a74b2df091e40eb3e5f5ef8a7300fbb9e372d044580f3b13b524b477e427feaf4cd5287d9782efed82032b93ed9c26071de7ec49e308c7bfdc7aa5e78 SHA512 00634eb95018ccb2ece0adf4b7e3ea96674f0c8dd63d9bd151cdf9c871898fa24379f78065ebb677cc87eaffa31e91ba60051622a38c6bd774e010c20229b16e
 DIST discogs-client-2.2.1.tar.gz 24645 BLAKE2B 310b2a23a58f58c0d258599ad88a8e44202a38850af72ead293bd5ac21a92521ee53cfd6d8340d4c122145b4f3797f905a7f5273c6b0e5e23e8aff43fdf09c85 SHA512 fa339b14d5655a36fdf252fd94c729ecb97e195c1f7eb2e5207355dc5f4fd89d0b738218ffbac71acab4f143870bdba5cf5ea02dff70166014f14c30481ae1e5
 EBUILD discogs-client-2.0.2.ebuild 904 BLAKE2B f1178b066c04c36423887cb7b0bb99575b2fa32aa41ec855eafc204bf98a83f3557124ed32f4e1309f091eb6cf2fb98d635bcf4d394f1d7791bfafd900b87e31 SHA512 bbb2cea98a2b1eaba304c2e2f116cf8f4129c17f06a216329a28945d507254e8419ea818dcba09df49e420f7634eb938e80cc46b79531c9e0b70657e755d213f
-EBUILD discogs-client-2.2.1.ebuild 833 BLAKE2B c397ce9f3cf875639b21eb4333274c1be3127c39b938eb4f66b057092c99e5513784cb4875f4107737a4a12d0d4dfa0658a195a226105cdb583ecb2103467a62 SHA512 75dca816850a24cc8a52ce722b4551be626651c4981f1e351f8f6f86346936f71831c4aed14d8e7439d3af22b667c4b4befdfacbed193e0924236cc7826ce08d
+EBUILD discogs-client-2.2.1.ebuild 713 BLAKE2B 9abb0f43706b310c9242877a805ebde48150ce289711ba4610b63a2b394df9cf6fb354ab26e6e5db594c5114540585515d498c14fc0f63a15b02775daa8c7096 SHA512 966ded7cc3caf3a6c62db5ad84275eecb7e77fa13e9e2164834f7f7e32f69ba0b1e8ff2ac438abe56f6109f3b0958f072e2b78bb2d595a72ce3ae6ade97fcbf3
 MISC metadata.xml 391 BLAKE2B 49def6f22633b0f670c92c9abead7bd18955527bf30c08443d3fa161ef1e8a9508d540bbdf4fbaa801d6fcad0a1b3b26071c25ad081ad3eb62fcceced57838f0 SHA512 37252a778b2f529b74e72a6f873bb1bb693c339619a7d9c236ad96a8693d9ec04e40299f4be8a03efe48b3f0ea052a676b5508871e3d03c82d2ba814ac325bd9
diff --git a/dev-python/discogs-client/discogs-client-2.2.1.ebuild b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
index 62c0629bb3b6..0b6a6c19032f 100644
--- a/dev-python/discogs-client/discogs-client-2.2.1.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-# Not py3 capable due to oauth2 supports py2 pypy only
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
@@ -20,10 +19,9 @@ RDEPEND="
 	dev-python/oauth2[${PYTHON_USEDEP}]
 	dev-python/oauthlib[${PYTHON_USEDEP}]
 	"
-# It's either this or make a test use flag to add RDEPEND behind it. Both work
 DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+	"${PYTHON}" -m unittest discover -v || die "Tests failed under ${EPYTHON}"
 }
diff --git a/dev-python/enaml/Manifest b/dev-python/enaml/Manifest
index 7f73babc9ca7..0f919e456830 100644
--- a/dev-python/enaml/Manifest
+++ b/dev-python/enaml/Manifest
@@ -1,3 +1,5 @@
+DIST enaml-0.10.2.tar.gz 1568147 BLAKE2B 627e34f0703a54a7298c405406c2d96eb29f0d278c535f9e0a49d981dc8c4264a935fe34e97e4a1cfbcf4f4f1b9c24e00596bd850bdc87a29ef4429f9d620dce SHA512 fb78d5202fb595d28aae92455a70d4e6057c8a5daf05b4487f6e3aca38b7e495684ef6ccd4ce5bdd04e53be7231e6d39db73341005c12922d69ccfde38b84957
 DIST enaml-0.9.8.tar.gz 1455642 BLAKE2B f17b5a4a531b231babc44ea9c81d607989fe0a80a4c2b1c9ea7c0ef880388523b72b5e276d7815196b515052cefce78f3d29b08c67c181ffd080557d87098e30 SHA512 e9b88d1fbb9e82564d3a865f74685b1b1f8b8918e29dd4d7ce7d6b4b2e6d386c6388e99f9bf0adb02fb9277a57519f8502a33bd6e0548fd1a4d52d0a4b33cf02
+EBUILD enaml-0.10.2.ebuild 1523 BLAKE2B 504a3381db23dacce4b9b7e64042a3b793a5270d0fb383e31daa8cbc3bb043cf81c35028aad22a185049dc034604648dadebcc61703ff72dc22d6e0db78731dd SHA512 c757ae675acac4b20d07369f6f229796bd62acde3a3b85b956a3bd0edb5e98e837a1aeae81046012bcc6b09bc09f012112efe58a85a27622d174893f60d039af
 EBUILD enaml-0.9.8.ebuild 1671 BLAKE2B 39da0c281b6e09bf9cd012b3d98f3e0b293d672c9edf9f0f1da5ceddc5dba15cbc8bcb8480bb78261841c57628d9782c7623053082f3a7f6a832ce597862dac1 SHA512 bab220c729adb94b406d6626653f06daec88e7938b2470b2942d09c53e322029713e190553afea5faa26c2bef1c667fbcb9db3ded0ca2dc126a1adbadf5b3279
 MISC metadata.xml 631 BLAKE2B c569dc2d11f6547b626497c18e70001cee289473eaae2c5bb7370a1df366b5860835371c416bbc2ddf4cb03b2b6edbc06ac7cb59acc2537fe52eb4ac501eed33 SHA512 2c642e89488173558b55516bfc7830c8e324f79508b133a4b238b85588f58417a8ed2edcea4dee94dea734e4e9d6adef873bffc12d53e4c6655a59bc7309b3b4
diff --git a/dev-python/enaml/enaml-0.10.2.ebuild b/dev-python/enaml/enaml-0.10.2.ebuild
new file mode 100644
index 000000000000..d634aaa9aa07
--- /dev/null
+++ b/dev-python/enaml/enaml-0.10.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1 flag-o-matic virtualx
+
+DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
+HOMEPAGE="https://github.com/nucleic/enaml https://pypi.python.org/pypi/enaml"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/atom[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/kiwisolver[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/QtPy[${PYTHON_USEDEP}]
+	>=x11-libs/qscintilla-2.10.3
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+# The testsuite antagonises gentoo conventions far beyond what can currently be dealt with
+# It also passes all once run
+RESTRICT="test"
+
+# Doc build now fails, missing required folder, use doc removed for now
+# https://github.com/nucleic/enaml/issues/170
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+
+python_prepare_all() {
+	append-flags -fno-strict-aliasing
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export ETS_TOOLKIT=qt5
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+}
+
+python_install_all() {
+#	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 6334498259d3..4c4dbfc568ee 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,3 +1,4 @@
+AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
-EBUILD gmpy-2.0.8.ebuild 1482 BLAKE2B 8c64e2f15ba5559f3e245fc5b672dc1d4906d47e5f6b36068db778a0bd47635c10077b82c68dc44ddf93170a3c55c011463d3c0014c2a35766069d0dccbb3a02 SHA512 5c25f9d11546c439696556a24347fc1abe8762417b502c3fe25c789db766b451d8b60c00364fd6c399d2ba7f20d955fdf771cfb64ef4a685142335203d43b53e
+EBUILD gmpy-2.0.8.ebuild 1542 BLAKE2B fb20edd608ed5e45faefb8b0ff17beb308b6b516a3a72cc099525b64fa0800d1616e6e1fe4cd0200cc0da261b5f7359c3c1645b381dac11861d27a774877d1e4 SHA512 177f172291aff5d84618a1a75cdbdbc5ab18e5fbcd6a373eff038edca02ff0d33becd2b02774d51ff6ce3712c7ad6437d4a1ef2706d05c3b484386eb1a807ecc
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch b/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
new file mode 100644
index 000000000000..d21e5a55510d
--- /dev/null
+++ b/dev-python/gmpy/files/gmpy-2.0.8-fix-mpir-types.patch
@@ -0,0 +1,17 @@
+diff -ur gmpy2-2.0.8.orig/src/gmpy.h gmpy2-2.0.8/src/gmpy.h
+--- gmpy2-2.0.8.orig/src/gmpy.h	2018-04-03 22:44:35.494621951 -0700
++++ gmpy2-2.0.8/src/gmpy.h	2018-04-03 22:45:33.580835296 -0700
+@@ -129,8 +129,13 @@
+ #ifndef BITS_PER_UI
+ /* Assume we are NOT using MPIR > 2.5. */
+ #define BITS_PER_UI         BITS_PER_ULONG
++#if defined(__mips__) && (_MIPS_SIM == _ABIN32)
++typedef unsigned long long  mpir_ui;
++typedef long long           mpir_si;
++#else
+ typedef unsigned long       mpir_ui;
+ typedef long                mpir_si;
++#endif
+ #define mpz_fits_si_p       mpz_fits_slong_p
+ #define mpz_fits_ui_p       mpz_fits_ulong_p
+ #endif
diff --git a/dev-python/gmpy/gmpy-2.0.8.ebuild b/dev-python/gmpy/gmpy-2.0.8.ebuild
index 1d39738f918a..9f2ce986f582 100644
--- a/dev-python/gmpy/gmpy-2.0.8.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
@@ -30,6 +30,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-mpir-types.patch
+)
+
 python_prepare_all() {
 	# rm non std test file
 	rm test*/gmpy_test_thr.py || die
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 5a60e1bda3f8..bc9a5d91c89e 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,5 +1,5 @@
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 EBUILD hpack-2.3.0-r1.ebuild 1042 BLAKE2B f50c4d28ebe1d1fad1e220dd1873ccb2d79379bd43e572f4207b6eaadaf9f969b1244719b23ab4686cacad101265638a4a2b87d1794c8fec67038da94e197320 SHA512 d10d0d338fd41f845557ddfeffda83c478ab8d92d0291cf9a674e84985ecb0622b132cea67421093c7a6b27e465bbfb70297fe1560f348a1ed5d1f010dba5977
-EBUILD hpack-3.0.0.ebuild 1193 BLAKE2B f59867e635f399fcf8c8573108f3a7ca60528ab177ed7200ad52280c2ecf7e73ab2f34621ae6ae5ef56e98943e459aebec606ef2800a29d2afe746c8ae4462b9 SHA512 dc769bb754f715e4f6e838f6bf7644cefa1ac3912acb9b59e8f9686a95c570f09870352655171f7a384f20554bbc0c5775e93918b46f0a2bc184f6b264153ed2
+EBUILD hpack-3.0.0.ebuild 1199 BLAKE2B 73531cb40b472c3c4ae4514dba1a770ff72e919dcad22f696097bb583e38f7eefe6e1e7bed735c6329cdfd24c7f29b11df9cb7b480a20fc76388de5108450df3 SHA512 5c6c2d478c0f24f239af5611b223e07527649d5c1ff10d3f5845249b0c809e59740b8438fd674349f98a093ecebc67df5d35177c52d93eb3b353b5d4d837d383
 MISC metadata.xml 755 BLAKE2B 07d55adb82a465399ac181c0bc57d6e884acc171eaf00ae4b32b1c7df02082a80e1904cca1755f755fdf3d7dee3028dfba951d7799485f43657c0141bc12c002 SHA512 0941a33f24de0db1f466447ba36585cd3d5dfa70eade8d076089cbe2309a7ac5498b77a712dc237f335a27c954b7b57be7c951c5a3c052b648499dbb545375be
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index ba0df3e83ba1..d28a69c82daa 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index 44a9a0c97e6f..f168d47e957e 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -2,6 +2,6 @@ DIST html5lib-0.9999999.tar.gz 889312 BLAKE2B 49cbab503692a1044ef37b11d9b776fb03
 DIST html5lib-0.999999999.tar.gz 245488 BLAKE2B 3d2409f18e7ff6b6882e163b782703a7d2b2d42f8c131ab05a51499a4cd23d75ff8d097c1ce87e9f28e8ce649bec8099d364f4d01ee64d0efdfc75fba1d01067 SHA512 b30d9ea74d0ad03e07ebee0d33caefeed717e6084f2ef44559ebf73948563ffd60e40c774e23c8964a32b0f265d1d1f0b98759861acaa208f28e5ab2813c3ca0
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 EBUILD html5lib-0.9999999.ebuild 1095 BLAKE2B ad1f21c5f04ed8c270fe1fc721a608e76f286029ee088fa5f30b037a06b9bd4f96487d5e1101a4df7e0871725113d4d6c129c9554b56e39efd4923c1bb2be4be SHA512 a556b56261fda05dce6005e0e8fc9fb58fcc3de79ceef34db2ef4209ca1b8294b7dd4aeb8dc055831de9635e452467d0ed27ebccdfc938f83835d4230ef5e0f0
-EBUILD html5lib-0.999999999.ebuild 891 BLAKE2B 68f8c063fc19c261859aefb91624a712c8da006c939301d46c77d6dd050f940607b88e9bc82d5d2f7f615d8aaf427ccfce1deec046e67058aa590ed47701e1c5 SHA512 cd6f737f856b1b9d6fece5da6416b0bdb4eda80d3fc494a426060041c6b10e1d93250aae093f0297ee6e0a7011302d9009cf98d316d9d04f438478a9ef9ff987
-EBUILD html5lib-1.0.1.ebuild 897 BLAKE2B f93121016154721e68a7e80cece45e9447fee83b5028c830731178d9d1930e17253fa7bc2c1dc1f24ea6e28984495394351f34ef0b30b985ee356a59b299199b SHA512 8b2c64c4acb05814cdb3950fbc3af4950b4332c66fee0cd6a8001745fcf70f89c0f32c6cb7446f93867e5f466b78d295902593299dfd9aa7e29ff21598aee07e
+EBUILD html5lib-0.999999999.ebuild 902 BLAKE2B 0a4eee9541b3e256195d15bd3fb9d39191fd9f8ee755da586e2438f1affa014d1ff9bfa352f90a634f809de038993127917b6b599ddc3e7ca6f96082e321a911 SHA512 4480b232359af5c515bb6e2dc78101438d3cc1595be883fad2b62fd9d94d6ca94fd1d3f465f45a50ea7cf485095d66a02badbf6b47adb28f40186cf2ece916ff
+EBUILD html5lib-1.0.1.ebuild 908 BLAKE2B 201cd6804e3f70724617feb36585c46a6bd18c61cb23940a0acb43ae9cfc2a2882508cbc6923c05345f907aa14c19fb66804ab6a226f4acac40ce30a0edf3905 SHA512 cc5764490c8ad340d98b88e9bd027eef1688772143b7a51e8e6d679269b367221b4d3f633d9e19677efc127d45a56974e58de447d727617316cbd91d92f5591e
 MISC metadata.xml 589 BLAKE2B d98d80202c045607de5843e34313a06e9493c50bb1154e3f90a7c1c9236de2b4369827d35cb8540125524b54c0453ce56ca7ecf3a359bd9bab6e548ea1377f9f SHA512 b619c0adb0c781b00e656b1027465ec19d1ab7d0792475f197ab4164cb8a1c26563dcf48d147e346637789c8ec1603afaea428357c1022c42e22b85967e1694a
diff --git a/dev-python/html5lib/html5lib-0.999999999.ebuild b/dev-python/html5lib/html5lib-0.999999999.ebuild
index 01deadfdd3d0..6d7903ac144e 100644
--- a/dev-python/html5lib/html5lib-0.999999999.ebuild
+++ b/dev-python/html5lib/html5lib-0.999999999.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/html5lib-1.0.1.ebuild b/dev-python/html5lib/html5lib-1.0.1.ebuild
index 1e9cddcf638b..f9a1272bea41 100644
--- a/dev-python/html5lib/html5lib-1.0.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 69a2d1a25559..e4bf9352143d 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
 DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 EBUILD hyper-h2-2.5.1.ebuild 969 BLAKE2B 37a125cc03670d91465b632a3dcc2b16a2e373f6feb9110364961727a0db74a64d1d7ee8b8c61447a0911be5031761f6f0026e911f614a231840775a117b81f9 SHA512 ca50d7e3c3d03a2ccbe6b69db1bfc3f0a7a5a20fe1404741a3228c6c354e61815e8d61c314e9633643128ffe715a9976039cf8d6cb0802da434e57868778253a
-EBUILD hyper-h2-3.0.1.ebuild 912 BLAKE2B dbe2fa3f17fd3965a79be2266abba8a3b9ff03acc1e5e8de161aaf934c22c5e8f5a0745244e8e3ea38118d582762390b09d648057ab94b40c9960512d4a12a8d SHA512 853944aed91d876f4722e4bfcbdb9751079e5332b93deb363b958dddac7c3f50d4d1b0cd3154c20189b4f1d2a83422094e8b9282804c185c344e98605bc0ada5
+EBUILD hyper-h2-3.0.1.ebuild 918 BLAKE2B 241c4148410bdc34f52da9f6f38ffaec31518f3dc548974154d7866e383a8e20cd93ad7e8f2aa7415fe47c7d49d97d725fa64ebc34b587937deadcc619834711 SHA512 099b2a8a0743351278847a0e46a8157dcc930b8e63ff0969f84ab28a85d77d6e5969cdb9c8aa47785418967d1aa1fc79ec58bf321502f301aa0010e6265995fb
 MISC metadata.xml 747 BLAKE2B ca9107ee5025360a343d9ec92424ac6be517d1e45ffb2dab10f0c37c82ee30db30a0fa9eaf7bbd0066f0e772e47a09bb11e954afe3904bfad2f672961bb608f0 SHA512 5efdebf70cf061471f14af5941c609b31c75208bc4f632b05bf017e493d4a8091a3fba335c95efacb0a1271aaae6a54589032dfa393d2844053cb859fd6b0d38
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
index 548e860a15d9..d514a4274ec8 100644
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index d8d1d2b59abc..b4613ab1295e 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
 DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
 DIST hyperframe-5.1.0.tar.gz 17851 BLAKE2B f9c938b74699029bd39e2b1541f18111fea5ac760d9047fd09341e199948da13795d786f5a0eb8e85d698f90d07ffd02776fb82638ec1f1eb564059401291253 SHA512 5326f1b3362086a905e9c9ec63767707547428311b3ccee28d4bbf2ce729869bdc6d30a21617984ec3ac7ebef5919708fc1f2edc08d22b99a7820789408e281b
 EBUILD hyperframe-4.0.1.ebuild 498 BLAKE2B 34db69b36514adc2a54f1ca0b7c2cf708471b3832b4f0406bd39e3706e0e1f92bb138481c5245398010890a04713d1089afd57a5ebe9c47e6fa35da33b1129dc SHA512 d2ba6a9fbee23223b23d84d018a07ce8d0d33a24f2374f5febb79823ca13a9975a3fe7575bec440503869654a41594837786768713dd847328bd2b5d6d10b976
-EBUILD hyperframe-5.1.0.ebuild 518 BLAKE2B 6977302680274d6131003c4cdc6023b109431951db71d150fd17598beda59458bf8a4bdd47df314f17f9de8d74a36e5efe318c53bfe983e3527673e37a1c6f18 SHA512 9604c1ffccdcb3910f1a566577e13f8d1ba963cf8b54de30fc45bf3c142825446b5b6425d22075b7c472fbde1933cd2b746416faa1d58d607af143f3b6f705b1
+EBUILD hyperframe-5.1.0.ebuild 524 BLAKE2B ca726889e6072f509b2eab18d8534b45f103549b1afc43f32dda5e7ff4af1c1a907ca7c047d6e463e6449f65ec3db4df5543aa809d5125bc77597dd68bc3000a SHA512 d8cc053f9011c499ae984e8d3976baf0c14a1de493628f78c56ac4292729c8c0f4531f5703299e8fb72a3f470e85851643bc219c037fc852aaee720f1c4ebbf2
 MISC metadata.xml 702 BLAKE2B 36daaf246eae4068fb2729e91e95865e831d1449f78f2c37061adff7530225c1dc7c68e245170acabc91178fc679116d5639d4779587f05a599566507b5da5a9 SHA512 4539720057ccf3c78a94dffea4f59f628a68e9f1d0dfd6ab987dd991f2b1b5e6d1b7b46c04fe1faf2249cdb481309b8a176c1947fc99801130a4c94f6a9a0032
diff --git a/dev-python/hyperframe/hyperframe-5.1.0.ebuild b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
index 1a2ed68b79e2..61146a000468 100644
--- a/dev-python/hyperframe/hyperframe-5.1.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index bde80087296b..8080c9662507 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,5 +1,5 @@
 DIST hyperlink-17.1.1.tar.gz 23067 BLAKE2B 8bf1e61c6ba72c1cef4a9df62168b513004ae8ef2d4fcc13a1984bfdbf174c6175e2bcd241396c97d4e07dd06999718c217b27432fdf36d632b34c2b97bcb1b6 SHA512 13b20fd54c6bb5d7de3c9a04133fdd848413d1308d9944a2288c76d5f8b9bb0c54401ca5ed53460112209806407497526f2e68a92d119656eb58a9a618e9b708
 DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218f0ba6d4072c7448433c6bf63891fb59999358c5efa605d21e28ab6e39a87cb84b1e3c8e2e8fce24892acf2eb679 SHA512 c0c9d99a530c938b1d1e97b8344c5a0fb18f894c8b0b294cc8ae6aa6a550a5a0272cc6be7a913d371f3ce3dd8695b7ed239999f3ae5e8ce97e3693625ae761bb
 EBUILD hyperlink-17.1.1.ebuild 753 BLAKE2B efb6bc61f300f2d1ce9a690a826465812993c9ac39f067d6f02299d1ac241ec135705e5b8bcb4f0f8e880bfa1db2c19e9b57d0a81b8ae3ed3f492c95efb15653 SHA512 67815bdaeb7a7b0016fb86c93fc45cff683f9faa9d76cf3d2db946a68796d42a1e1c9a6725c8cef4c9d40e3f9380c2e93a9426b8966bf40bd9c5a437fd8da8b6
-EBUILD hyperlink-17.3.1.ebuild 765 BLAKE2B 55eb3c2a3d8be4a64569a9598db0fc0b28e6b2fe9f8e58d5bc994c18457bc85c98b343c4991414899dc604e0ccfc40afe4c559567a1e1dd65651e0061857c8e5 SHA512 55e5e2fbecfee2c00fc2952ed05f95c71e94a7da2833bd8061a9137884936d6152553665772f4b780f123010f3f8784d6caac9b70ed28157794322bf1a4dabf4
+EBUILD hyperlink-17.3.1.ebuild 771 BLAKE2B 6679fb0f9659f811e8abacfa2efea5d6c56c08a79952cb58fa1fbdbe4f5dd6269104d2242746c17bdc2f9fdbb6901a8e8c6e0d3bd9b3cdf9dc596750336ecd0b SHA512 e1c0ba19149024a4e448bf09f430bb0ad67847d70b5504f73a71379535c68836cdb9cc0ec375eb069f7bfec32644962bf44a1f5346eb84295ebc9110f4973128
 MISC metadata.xml 751 BLAKE2B b9e49354e3472ca16622fd269867df7f0c5f372afa5f93c36c2646f35e0fe1e1fcd6b25c66ef73e13e442019be449ea72b26fda807e3d220fa254c4d7a691f21 SHA512 7cd14daa771935591e7a130d9dbcd20630074d49ffd738d964b631798a0466392e0b669cc009f3c769614d704925699f2bc3239bd5e78ba0c2cd629dccd72591
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
index c39bf2f8aacf..c1eccb99b002 100644
--- a/dev-python/hyperlink/hyperlink-17.3.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 23474ed4dbdf..9d07ed201e3c 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,5 +1,5 @@
 DIST idna-2.5.tar.gz 130211 BLAKE2B 3b00b76f9d86f0961ca4613c4239e39fa19c28f60640d2c9d9b7ea05985f9eceac122bb9e5b30b2f22648506580202a187f95513fe5ab0af6632917335f2eda0 SHA512 29a69ede25a8855135c763da5d20ff81832c710038a38521c127d5b7b24b355c6cfa5e9f9a2a4ef1fa4437537d1d9e4b448357e07b4b5e3724d98fee0a3b7835
 DIST idna-2.6.tar.gz 135992 BLAKE2B 1397c93eae23a9ecbcc001205e83fd684cbdb4f0c916c30b7d80dc7fdd43c588a9a81a620a39108a31707c1aee8c4a315d1988ae5a8cf1f6519bb11bad6dc3a3 SHA512 cb5dbfab44c4d11521c67f9d29391f184d1267a3da6dc89f4ed12c60a7a909d5c7474c3ea2bddd0af7063f4f620e87a8dd586bb07e8b961b30b1dd7c969704c2
 EBUILD idna-2.5.ebuild 604 BLAKE2B 682e9cf0cb1576d33c6575067c79219713c5c86b479eb1cb1716ccfcec6bacc36a00a437a3fbdce9b4360cad6cb03075793777aa1d97f66173ecd21aaf6e3d5c SHA512 d2722bbe1c458e10655a70079ded3d67a2b7b7d18f131e507dab42933abfaeb4c8579a8641971109a1b4bdd2220f5edea5cffa01b545fde68dc61968523fe9c9
-EBUILD idna-2.6.ebuild 660 BLAKE2B e90ee637e6e2d55e3eb6c9f6632c63155f6aa2908a5c2f80ea70b05ae6e18fdbb168032b4c3801567234b8c14f39798504aab31d3cb75bfae634ab5d350243d9 SHA512 993535f0771d9906fc26a9092854608309ef05b69e6f70f1dd20fa01033c2a2b4829b1abd7aaaebf3970d602bc155480c0d9ce0026f27be863a5a23f5b275727
+EBUILD idna-2.6.ebuild 671 BLAKE2B 059e000a3da9d5b1451d54db921e5072832413247180cff786f184ca94a95fb5dc5df2d44bab2f5d7ca9b03a366e6de57065e00b676b7e35e45a6dbf1890c9a9 SHA512 0f830e1f29ff9a4d1734a1a1493e85017ce7fec0c6fd099594ab23caa7cf019a239d717a2a756d3437be1d33c1a2f5da8dcc05a44dc1d38a5203f87e6140dfec
 MISC metadata.xml 367 BLAKE2B 363038f61cdb96780faecfb8c92d97d0cea8146d37374a731daa9618150b3f41c0bad724619d7bb353141834df9fcb88f075ece91a742ccca2da1621e5b8e2fc SHA512 50f13044fec18651463e6199826a39c7f28c783e7da389017e2dc2fd6f17b6c93e4e437a1019e0e31605a06a428c31a2fbc12744daa957cefbba2d76b511331e
diff --git a/dev-python/idna/idna-2.6.ebuild b/dev-python/idna/idna-2.6.ebuild
index 7aa0e206baaa..ea37b9481f8f 100644
--- a/dev-python/idna/idna-2.6.ebuild
+++ b/dev-python/idna/idna-2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index 6d13c1bd6f4d..fde4542eac10 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -3,5 +3,5 @@ DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260f
 DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
 EBUILD ipaddress-1.0.14.ebuild 617 BLAKE2B 77e3ecef32c54642bc2e5ffeea21ea424118a86eea0cff1256b2515e7781ce7cb0c619e462753dfc92160b55ae6ddcd30576cdca424176734774e0d20872b8ba SHA512 7b21d5cd33817248dcf66651222695cd198009682bda5ed82c0013593557fa85daf7677218c58c1a635e035f4adec9ee093dfc719389f7aa6d0517156b06f08e
 EBUILD ipaddress-1.0.18.ebuild 656 BLAKE2B 6391c57a20088a880d68452cdb1bdbcd81750328444b6383119f359a92ee3c9855965ed472d939c05772ab0e7599d507565d59b84be4a18f667ab6b74b340975 SHA512 78f7b945c912c19172352c9134f7fa9896e925803a3bd8d0145b51e90bf8a1600ebf8e0bbb9418538968b84f03cc909e58ce28c6787ab24ad5f87203f5145290
-EBUILD ipaddress-1.0.19.ebuild 648 BLAKE2B df209e9967c8f09fbfe943c8ddb38889089c451cb2b5a71e326f1d43997be58701bc0220c8968814491245af9e80c448accbca7de595c18e3c26c4ea735a30d0 SHA512 7d9caa70161db0cc6940853d02285b1ea3f26ce402417e6753cd0ef6941607cca0180cd1121d037a3875446414af09e1c12b3e1e9ea5a1281946016de2bece50
+EBUILD ipaddress-1.0.19.ebuild 659 BLAKE2B b45429e6ff7ed6a3bd268ebee0dbcf3303603ed749fdaa1405b7f5970a109267d29c80c6dd3dbc931e277f0f365dce12af648d9330ce7f4cacc8c8741463e50d SHA512 bf2843d3e345a96f0b0d54f501edf714ffd9509f86eab1476bfc9872531879abafb0773c66420d70c8049ed79480acfa4ca8f85e7334a2e1134b47754e159883
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.19.ebuild b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
index 636958f662d6..1fe565a9715f 100644
--- a/dev-python/ipaddress/ipaddress-1.0.19.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b2f8794b7305..0eb748e98c24 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,9 @@
 DIST keyring-10.6.0.tar.gz 40782 BLAKE2B acd327711a8f7deb08d172000294d5f104e2d01b65dc7412fa8ceec1c24405206982af04e75da0dfdb7a224a4f8c9ad6f8d5f37106e68eb1add637d7d5027c4f SHA512 56e9c11ac6d50d22ca74f6d677eb24da876a27c84501d8be4ad0cee44356a67213a7d255e0fdab1343411b75b55e9ab50210d0ae95879ae9f3acb8cbe73f9848
 DIST keyring-11.0.0.tar.gz 40883 BLAKE2B 50ce8bf1265899a3054edf2fabef75694190e06e83a56b5de8e76b3d6c4ea460971d74c1a03d936765914d3b2a1812836bb56363911b706d20d59c158e8478f2 SHA512 d4937e84e6de18ed8fcba02d2d297ecc5a6434623c362f5608141041acbc7bc27fbf94e54a5a503a02b725df737fa8505d0d91e2c3e84298fa4044d7dc99f207
 DIST keyring-11.1.0.tar.gz 25518 BLAKE2B 8b23853a15217a4d51a30d2add4f2e4eaa9af788c37fbb821bde69081d120f4a81560d2165b067b3eb299903a35d0316d944c3889c312745609085bb6ce29cec SHA512 3fb099f8a72c705ad1e2387b67ca3b9bf18615f9253e589bc8996e3b31db4b295a925ff95ef52da861e94ecf10d080db93bde1a7420e8de12448220abe2e016e
-DIST keyring-12.0.0.tar.gz 25387 BLAKE2B 701a7c7c66761f7d096229a61ccc53b26ae0a5fcd48d62c1109aba908b83a8a0f273bacf25dc182bece1bc907a8ded6765e7d28abdf1c5aefccb37b2c9a1f1b8 SHA512 1d9a00aced4d3116eec4483513911ce338900742c005215edaa91df1839495cd102cd7454a1cf5f4a501698866efdb26cb6c5bf551cb1cb4951f1e485371fbe0
+DIST keyring-12.0.1.tar.gz 41430 BLAKE2B 5717aeab6cb25f909679565b16f9400c599b5bc235b459483e704446d52b1119598827140e44cbc39aff527e8e60a9ed66b2555527cb268a2daa843c42c41d03 SHA512 f55639429500b571ff648bac91dc63cad2988296bc9d89a69f0dfe4fffd62db5996acc2d88884a144aa63ed6e9b68c068bee8b3f0bdca8dc1c9120c08d0c77ec
 EBUILD keyring-10.6.0.ebuild 932 BLAKE2B 391598d0994a6980630e8a9fbcc8959de0727479ee10a41e36da38a540ca1d01e5e1e1465eaa82da8e9c5a17f5ed1f5812b0b051e56041575ee18edc2edd89ec SHA512 712802fc1856f0b9f07b0a035c950b5fd44e5d9f74c0be353482ea2a8575eae50b4acd60f7ab37b5db9e8a1863b0d21b0f89d86f5dcf19ed054dd122133b55ef
 EBUILD keyring-11.0.0.ebuild 932 BLAKE2B 97e2368a84d7adabaf2b96b0d0f10d8dc8f6e229ecea4d48ee15939867a5bd7ba361e3e985d0233c8b786f031adf7987e876324adb213d9d220762c1c1c6aea4 SHA512 1c5c6c490dd19c9fd92a440dacb39287ceef7907becf2ffd346025092e8c639549a0eb259b3df9dee9f381c14796770438004711c2d7787f5b0f3331fd19c188
 EBUILD keyring-11.1.0.ebuild 1021 BLAKE2B 59d8e93d9145669a23ac81792aa881daa95ebe11e87ae0c7d7b7203a79404403ae4977c7fc3f520dbb53fdfa412dd22a5c5ca45727bf5280f46dd988eae07d86 SHA512 bd8ec804960a12965fa4f5bc0689a77728b8fa1c9e851b696814d576dfb5c60d6950d0646f59470b5e8cdb956199e60d86ebe24b1c56b34aaafcd82cf9a8dc5f
-EBUILD keyring-12.0.0.ebuild 1021 BLAKE2B 59d8e93d9145669a23ac81792aa881daa95ebe11e87ae0c7d7b7203a79404403ae4977c7fc3f520dbb53fdfa412dd22a5c5ca45727bf5280f46dd988eae07d86 SHA512 bd8ec804960a12965fa4f5bc0689a77728b8fa1c9e851b696814d576dfb5c60d6950d0646f59470b5e8cdb956199e60d86ebe24b1c56b34aaafcd82cf9a8dc5f
+EBUILD keyring-12.0.1.ebuild 1021 BLAKE2B 59d8e93d9145669a23ac81792aa881daa95ebe11e87ae0c7d7b7203a79404403ae4977c7fc3f520dbb53fdfa412dd22a5c5ca45727bf5280f46dd988eae07d86 SHA512 bd8ec804960a12965fa4f5bc0689a77728b8fa1c9e851b696814d576dfb5c60d6950d0646f59470b5e8cdb956199e60d86ebe24b1c56b34aaafcd82cf9a8dc5f
 MISC metadata.xml 672 BLAKE2B dc2296acdb196c85c9cd2c2badc6ee991258e43f340576990610fb975837dd9e24c0f2aee0d24c6b8e79e17436719b17e5ef3a4d9c356b08ecc5f33881cff2bc SHA512 19e907e069f6e6092791babdd8b914791d1c52c32187747edc127ce4c80ecad2da1edcdf6e6387c15f9c2b041767b9072668197087afc3644b7713837d5f2ac9
diff --git a/dev-python/keyring/keyring-12.0.0.ebuild b/dev-python/keyring/keyring-12.0.1.ebuild
index 0dc334c090f0..0dc334c090f0 100644
--- a/dev-python/keyring/keyring-12.0.0.ebuild
+++ b/dev-python/keyring/keyring-12.0.1.ebuild
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index a0855ec3c808..45b7d9f96ef9 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,3 +1,5 @@
 DIST libpillowfight-0.2.2.tar.gz 23125494 BLAKE2B b9620b0e574869d1efcc9449e09f281a5d2611ec15f144ee24b385b5f6f693f037c844904f0abc715d49125df7d1a27d6c433aed83b33371b3f07310be8288db SHA512 76dcaf9105b4dbbe427851d794e92ba023453e2d750ecdd4e3feb864534f9d99adb562b719b7c9af299ae16c0778b510ab96b4997cf9bcc6ea4c6f8f7471ae8a
+DIST libpillowfight-0.2.3.tar.gz 14567996 BLAKE2B 2b3f289f8a86b2b50004adb158dd992fd18bdaac17f21de6f3a9493c8a54a869a788a71d71257845de43f6fa048789944d1b49fd2da190919dad18db7f7d70d0 SHA512 a1098776157a2f552c84bc0e36d8d69ec59e2405bb351253ebf4c5c241fe1ce0de01fac20b4240d010d555afaf4d2c269adce8c89894ab301e14f8c891a744da
 EBUILD libpillowfight-0.2.2.ebuild 676 BLAKE2B 07c3d9097cd838705c06523c4c19b8314b822ce7427c011da9760b2b033dfb0aea8202ae3cbe00546cdb20074f121b607f66ceff7d712c4e24e39d89c22433eb SHA512 8919455d801ce8da7f49b41728d3dd41362b3669e3a23a57b3381e6a97011f3e5ddd045b3c5b59bc7fa08b1f02634076c8c288ce9d2455874cd1b672079fb46b
+EBUILD libpillowfight-0.2.3.ebuild 811 BLAKE2B d3cb69760775fb5270b938ad5c151e4439efcf57727855075bdc6de743bc615cfd5be22d15b3975197df3b6bce70e412111cd6b6703ca7e09351bbede63a7547 SHA512 fc2a2d2d5c6f35c0737da76ab52172ff3fd387be38948890111c1f680325d3d315ec92b70097a258068fb15e1663e1c9a564801e334f6f4dfec2e44e78994bd9
 MISC metadata.xml 349 BLAKE2B 4b7c076969b0b1a899de7615bea08f02595e340b4ec1228e630d8feafca7709693993ac48dc3cac91ab912cb1c41fa13dac818e598eec4bfb8d928d385484b98 SHA512 5934060618b194c844776072f78ac15400fbee4629595a8c3ed60acf30b4ffd9cfed4dfcd9b263101842be197a1491daeb3e929bdd924839c17819b185ae7578
diff --git a/dev-python/libpillowfight/libpillowfight-0.2.3.ebuild b/dev-python/libpillowfight/libpillowfight-0.2.3.ebuild
new file mode 100644
index 000000000000..72af33a9a741
--- /dev/null
+++ b/dev-python/libpillowfight/libpillowfight-0.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small library containing various image processing algorithms"
+HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
+SRC_URI="https://github.com/openpaperwork/libpillowfight/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e "/'nose>=1.0'/d" -i setup.py || die
+	distutils-r1_python_prepare_all
+
+	# Upstream Makefile requires git checkout
+	echo "#define INTERNAL_PILLOWFIGHT_VERSION \"${PV}\"" > src/pillowfight/_version.h || die
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 73aa29e82a29..de6a2134ffcf 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -4,7 +4,7 @@ AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbd
 DIST m2r-0.1.12.tar.gz 15358 BLAKE2B 07f22ab486df3b0382c427b9c9ec3e1e2557bcd12edefa3800fea970012e55d9a6e66dfc720ff7ab394003bc26055c68756b4578adc2de9a5cbc4089ef5c534b SHA512 5579f993c9a8aa72195e97ba6ea2a317f97587f2f8fdab6d7cc16ced6ccc169960a99c712b9ab1251cd021b03f1c5566139bfe6c314bdad43b9bf138a921f0f1
 DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
 DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
-EBUILD m2r-0.1.12.ebuild 1214 BLAKE2B e54c13d162d6793df0916ecaa46625eb3f6569f82bb67dc8fd858aa5e07bef9ebd8fb89c286a738415a9a405353a6300e055d522e1904e30bb9f5d027736fb13 SHA512 1c5ba67d1a8f3901c1c4eefcc6844aafc3fd52249438fd85fa3f43f1ac8732cd51ce6ac6c29831c6668445d2d300d3cb792853249cd1a6990f0315df2c88a411
+EBUILD m2r-0.1.12.ebuild 1220 BLAKE2B af27c500eeb935256c35a9e5253cc65d959008b7d2570734b214992dd9a419037de44fc93e1682bcf0fb56fbec5f061096caa8ed5f2f16c30347c32eefe6ed0b SHA512 50cf56ba9c1f76f145b59e276df6112c5550595c1e84a8aa97571195ef8e684dc50039c7da3d8110e0f69ccf44c23d344fe3d9ab2675e3250903a2dcb256ffc2
 EBUILD m2r-0.1.5.ebuild 1273 BLAKE2B 8fc9cf2449c1d2a4cc6a2b0e78729b36285ca64e6793f59bbf3efbc8e8bd5f0bbf29b8bdeacc1031c925647331b69892efb880702bd7cdb425695c1750902380 SHA512 d8eb0338f32152817067fb8c2fb416173c95a30ae09606480083bfa8cfd97b4faedcb722289f60c275657ec509019c8d9c73c757c9dc473ae717d33d96a735e2
 EBUILD m2r-0.1.6.ebuild 1273 BLAKE2B 8fc9cf2449c1d2a4cc6a2b0e78729b36285ca64e6793f59bbf3efbc8e8bd5f0bbf29b8bdeacc1031c925647331b69892efb880702bd7cdb425695c1750902380 SHA512 d8eb0338f32152817067fb8c2fb416173c95a30ae09606480083bfa8cfd97b4faedcb722289f60c275657ec509019c8d9c73c757c9dc473ae717d33d96a735e2
 MISC metadata.xml 554 BLAKE2B d275cbf42dd1621fd0dce4fdb85cf0832e3160cf7468e729d39f33afae099b354ccb21e6de312888ddb6d2e97a487a02cd9d97dee033eee960d0ffbeda70c704 SHA512 ff9d0efa78e4931a4f0ed8097cfdb1d32fb1a99f825199fae42838ee534c045c30c440e9f8bdc41639adfa99efb672a587d11f84f1bc7215f8e59655e1dcaa49
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
index 7af34f4c01b2..58f6cb4990c3 100644
--- a/dev-python/m2r/m2r-0.1.12.ebuild
+++ b/dev-python/m2r/m2r-0.1.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 2a08bad0c59b..a091a6cbdc91 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,5 @@
 DIST mistune-0.7.2.tar.gz 48887 BLAKE2B 4ff0286483e593fcf5183bfed18b90c39b93dacdec3bba474d6959ec1da162dd75820707a8ed9985fff4c15fe88a12df6fb6af20b9a40de173acd7c0a6e02893 SHA512 9002bf83a368671389f05928f4f689064a1e415e54309259b6bbb7781b4bfddbbf834e2c63ed3271e1e6ec7b78c1665c7708177b9723433d1e2ad4b13ad903ca
 DIST mistune-0.7.4.tar.gz 49304 BLAKE2B 9426007f618e645832d4d73db29cdda63e8426c9e52bda06935b0003b3c4f0122b14ca893ef4adad96c7d2f4b8be777efb6862f5370bdb9b08394129fd22e7d0 SHA512 d300bec23f5482396c6f282ee3d773461c162791e4605ca40141eb9487c8b158ac7f47f6338f7c3bf27bc614292ecc61dfbf419d47eab817821f18cf80103802
 EBUILD mistune-0.7.2.ebuild 716 BLAKE2B d97bc3c53f8ad6e388de0d0b9b854a94f08706c9e4ec713bd2243891f1a86c8448c29de6efae7b54c7f292c8fde328946933316cd01196f6a947b2a2b066fcb0 SHA512 0cf7b687a521943d73a883fcab7a5a91dc0cbdc0b438cd5fc231eac48d2a10b81e2c50fb8900a47607ab595750228350d20bfde9bdfd5a4aebef283dd7e3637c
-EBUILD mistune-0.7.4.ebuild 731 BLAKE2B 8ad261af398069bb1a3646a5981f4448ccc0e30e89a93833d8212e883053fe0b47f4dad13174c5819d8c89e31b21cf18693e91f914bf1494f2cd93296768332a SHA512 f770765cbc54a819728bcafdd58b17ea63e7954ae60fdf1da880882d16c18342b5ba2c2aa020aa8330f698644a8a2a2f6b18982e343015b258770beaaf8ba01d
+EBUILD mistune-0.7.4.ebuild 737 BLAKE2B 4fc6441773b492bf878ce79b06c77906ef3f638719b2a69e4c6802f246c2eb4142690461269c9cc47f251ba3e1245a9d0f3ecbcaf6fde470e28a144db23b5487 SHA512 296c9296c8e97cfbd49b4065b053caaf12f5ce2018ee86585457f8c45277e89cd01d619893bbe6347657956170d947bd5a2c7f2295638b8f75cbf1dc7ff9d04c
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.7.4.ebuild b/dev-python/mistune/mistune-0.7.4.ebuild
index 0fc38fd7f333..902ae2b7bd4b 100644
--- a/dev-python/mistune/mistune-0.7.4.ebuild
+++ b/dev-python/mistune/mistune-0.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index ff801f67117f..56dac9a165fd 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -2,6 +2,6 @@ DIST ovs-2.7.0.tar.gz 73714 BLAKE2B 3edb76be6ddb20243b6d85c7bc67024c274f625c2f18
 DIST ovs-2.7.2.tar.gz 74222 BLAKE2B ecf1cfa9cde4824ba927f4fed610ca11129d221f4ecb2c0f0fc701f0fe2a9b86fdc67332b0e0270b0eb1047aeb49fd41d153a212416754180a35dd916cef59e4 SHA512 568f256a2ad204d5b4a237f1f52c903a1041bb03e30b56e390ea4995c646b49225f69eb5804faf996a9db56916398597100a16ff86bd6798d01ee427073c89ac
 DIST ovs-2.8.1.tar.gz 74483 BLAKE2B a90904e645316b625c7fddcc323270bbb6246d59432392bfbcb05ed0ae258f1fcc0afe7a3716dad519d47725a3f765c99c59dcffc30bc5343de59ccf523cfa76 SHA512 b7133f5c2ae00d508d77122952584cba840d4a22231d1a42105ba2918cf598b12b58c47408c17405bb3c9aa90d24a3d0a9257299626704e367badc982aba62ee
 EBUILD ovs-2.7.0.ebuild 489 BLAKE2B 1bec44d0fb204f45809b07343580d142f8422247e282c82c4b70691b59e71adffae4d5b186317b7c36ddb048c099e3d8deb0f5b95e9728853d8d8e9440ca4400 SHA512 0769f6252859597aa3e1cbfe7b7d2383e1ef4afb7ade578616e9ac75d62d1b8cf06828d59ddfaf45e04edbaa39a94c17fb8264445b480dfd0a33b16b1b4d082d
-EBUILD ovs-2.7.2.ebuild 458 BLAKE2B a18ed1e904079a887c57a9d2ff787f872e741fe70cd363631d4d855dcae1ab8789e768e97345e3854dc98978c9daf637115d9b99908332da47b6e0faddc74d72 SHA512 a82f4698aa8c89cef038e7a102f351dec9202a472d17a152fdcc317143194cec6e958bfef0b380b7343c88eee5f4cac8e3bca98d6fa8e9852dbcf73c48043d93
+EBUILD ovs-2.7.2.ebuild 457 BLAKE2B 7d054c7904947353ef7cc09f36d4e9a69b054f9296c84bede5d09e5b3d78896db6d17df02aaf606b45f247df148686287f4a7d0220e96cbb54927cdacdc96019 SHA512 a1014118c9d65ca347e4e2b7d72584e9eb99bd5c1d3b5c500dd208b2b3336e623b0e9aa16167e812d70fd572cb2a8b080dd9463423e242be3de6be1993a7e31b
 EBUILD ovs-2.8.1.ebuild 456 BLAKE2B dd00624a777a5dfaba64cc0f9ad3111e53cba057e197de54eff9533182b2c03ccfbe83941d68a01aad675bd52cadb64a5d905749a411aae2ca0d6a7c18c171b6 SHA512 0978b8400e5ee9303e4e7d11888f1d16fc3a191b9db4233fb6285851205c2399b9ecd49c9a70691b3ec30db15b18a16fccdbfb7d6c7134e6c510e6e7532c5b78
 MISC metadata.xml 455 BLAKE2B 4b3662feee3f99c83ee91117f441d7bae841764b4f6a153dfe96574e7f8181e0db9e6f94c93f59b009e419a3879f8825e2cd76699a7ca82b5c88fb9df449f87a SHA512 53fad2964967c6b5d0a17cea549a01a23b0365a22ea53aa8a82d5bc26a2491651cd0ee276566493bc497a2c033b1a2139a516865ef99ba639365d1709410be5b
diff --git a/dev-python/ovs/ovs-2.7.2.ebuild b/dev-python/ovs/ovs-2.7.2.ebuild
index b0aff0382bd3..061820bd89cd 100644
--- a/dev-python/ovs/ovs-2.7.2.ebuild
+++ b/dev-python/ovs/ovs-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 9ca344e738f6..706ac860d551 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,3 @@
 DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
-EBUILD owslib-0.16.0.ebuild 1060 BLAKE2B b3e7de65c5ef1e71d15d522e3e0c6e8fbf5e99531c3793cf7f4488fbd4875515cf7871d7b92c98828c0d30a004ed200bf9d91d3e40892c5974c3940faa686929 SHA512 38cddc260a591b6b3f70d19a4b4c01dc413b30c7b8e29ba188fbf6567df5945b35c0fbee97557011a057ffc318ff0affe488a9720d213c8634e9e98f1d4e649c
+EBUILD owslib-0.16.0.ebuild 1059 BLAKE2B a8cd5504fa0d64e1950ee7fd8e1852e5947b1aa80940a39639c81ca1c2acb9e111620ad414f58dff1f70405e3dd1fd08b4e32421e0450c0f44b0123457b4dbf9 SHA512 1d28e58712de6bdba82f81a6d558149b0145454a2d3bdbd32c91f420ec818c6f7d39d97de1add6161690d14c7a35bcb41c754ddeef83517c6d6957636b5a9f0c
 MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/owslib-0.16.0.ebuild b/dev-python/owslib/owslib-0.16.0.ebuild
index 905b9c4e1098..056c1a05c5b2 100644
--- a/dev-python/owslib/owslib-0.16.0.ebuild
+++ b/dev-python/owslib/owslib-0.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 6bd001491df7..773fe1b5b200 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -13,5 +13,5 @@ EBUILD pandas-0.17.1.ebuild 5955 BLAKE2B d6a2126678d1c93d16346c7a83425810eb11853
 EBUILD pandas-0.19.1.ebuild 5913 BLAKE2B 994e9ea3397d2dacb0a01ad17c8285cae39a898c5615b42598f0a85745a74b4c01a2968da343a969160f18658fdae8cc6e6f0288f7254189d6233a4e16b21923 SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714
 EBUILD pandas-0.20.1.ebuild 5846 BLAKE2B b6abf38026c04a904b40d130c039c4395fd0bbd51aeb584a72428a26afddccb90198e6e02469eaa3942f6f76b95bdd6e9b53f433cfd5fd7715de9729ea35fb41 SHA512 9bb42445edb8f4dc62df830e30b8ea2e0856bf214f0621d7cbecebd2adc142bc2a4031e162e9ff93daf5f600d9e405386a32dca515fa6433f91e962c8ae00c37
 EBUILD pandas-0.20.3.ebuild 5759 BLAKE2B 59d904b1b8ca18a0baf2f58340a0b24cf1e99bee4a40a51530ec9fc79eac2fa093a05aedcb7f0e268d06a1828a013736679d26594ba443e1ad763d69c062f29b SHA512 fe6f54a082a50d4ab3edb16c9b2f11cae1440027b06e35b539133b76584c9ae615fa9f72a70328df26de7012c67d250574e47ec0b443eb84e480792b6743846b
-EBUILD pandas-9999.ebuild 5830 BLAKE2B ff035f3603bb43b5695b29264dba0883a95c8a9adb811be386d70ecdd44988b0ea90e34436654acb03091217582a21bc949436b7767bdcba90dff53417c753b9 SHA512 b3bacfba75d58b10f0e4861ed7df8127af02ad4b65c71af58a5b68f43df23b0cb9c0646a720edd9f1dbdcc1a7fc59bbfd7d086428cc8e4439b46de24acfc18d7
+EBUILD pandas-9999.ebuild 5824 BLAKE2B adee94b3e8a50e86a21ef64b75650ae372d7b9d9be888519fdf4769e6fe3d6e4425e5c325685f820b8d7599addc39e260d6b138080b40f9e275586dae9a3a096 SHA512 043c913888f3290c2bc651de252ac73d8ea9c9061a72781f747d291f46a3f8dd4b760ef2449f61b5249a79293dcad6ca389b11608e0431c6324c9e1adde1a189
 MISC metadata.xml 1077 BLAKE2B e9bfcfb9fc1baf813931a3cd0829136cdeb0a52a3a34a0d0ba28fbad6d4c3ebee24f1e5624d5242541fd14f4c435830b68ea30eab03d796e497116bdff732c77 SHA512 60b23a75873ded48dd01a36dae62f45f1cf5d044b88b125bda249fd6cf558ddef42d6677218053ed9d73de31da54f1f85bd1f64eab9b377f1a8b51fe1c510308
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index c29b323ee1ac..6bf3185ad30c 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 VIRTUALX_REQUIRED="manual"
@@ -18,40 +18,41 @@ EGIT_REPO_URI="https://github.com/pydata/pandas.git"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS=""
-IUSE="doc -minimal full-support test X"
+IUSE="doc full-support minimal test X"
 
-MINIMAL_DEPEND="
-	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
-	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
 RECOMMENDED_DEPEND="
 	dev-python/bottleneck[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+	>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+"
 OPTIONAL_DEPEND="
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/blosc[${PYTHON_USEDEP}]
 	dev-python/boto[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
-	|| ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+	|| (
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
 	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
 	dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
 	dev-python/rpy[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}]
 	dev-python/xlrd[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	X? (
 		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
+			dev-python/PyQt5[${PYTHON_USEDEP}]
 			dev-python/pygtk[$(python_gen_usedep python2_7)]
 		)
 		|| (
@@ -59,13 +60,18 @@ OPTIONAL_DEPEND="
 			x11-misc/xsel
 		)
 	)
-	"
-
-DEPEND="${MINIMAL_DEPEND}
+"
+COMMON_DEPEND="
+	>dev-python/numpy-1.7[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
 	doc? (
 		${VIRTUALX_DEPEND}
+		app-text/pandoc
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
@@ -91,23 +97,24 @@ DEPEND="${MINIMAL_DEPEND}
 		dev-python/psycopg:2[${PYTHON_USEDEP}]
 		x11-misc/xclip
 		x11-misc/xsel
-	)"
+	)
+"
 # dev-python/statsmodels invokes a circular dep
 #  hence rm from doc? ( ), again
-RDEPEND="
-	${MINIMAL_DEPEND}
+RDEPEND="${COMMON_DEPEND}
+	!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+	!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
 	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )"
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
 
 python_prepare_all() {
 	# Prevent un-needed download during build
-	sed \
-		-e "/^              'sphinx.ext.intersphinx',/d" \
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
 		-i doc/source/conf.py || die
 
 	# https://github.com/pydata/pandas/issues/11299
-	sed \
-		-e 's:testOdArray:disable:g' \
+	sed -e 's:testOdArray:disable:g' \
 		-i pandas/tests/io/json/test_ujson.py || die
 
 	distutils-r1_python_prepare_all
@@ -159,5 +166,5 @@ pkg_postinst() {
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
 	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index a2d309419d15..3d97781ea507 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 953 BLAKE2B 15a9f91e923fb64b9ad679974faf446cb537db5737359fe0ae30121d44fc012309ff0e60bf4694a58abbdf08dccf03c080f88a9c8df7e835501d6b4631c13e7f SHA512 2647a6ce2326522321892d56b98ff7648f30b7b782459bc39975e51de0fdb5360d2a6f0740110e9514be8dec46e332b4e8aeaff55478e68e3d4a37710cdf788d
+EBUILD priority-1.3.0.ebuild 959 BLAKE2B e29daff29610f6a6b14ce3be19b6b7dd4ee0294d5682a11c94fb607e1b19f095a5a303ecffb66511bb35ae1f721776133885db54c5ec5bd890b71b60f78aa067 SHA512 d4e1dbebe0f3c416369e20ab617643a1bc2f97d5f6d935b7ec88245eefbcef64add6f14b0b2aec7dd4b14273570457b28260cdfa812ad387c8ddf9621d72c561
 MISC metadata.xml 917 BLAKE2B c92ee27c2cdaadab26b9d68451c0b7ee055e26ba9457e5fa8dcbf2f9b4add141d07e85344d7de536db6a4a40da92d79c67862da2bb381f0bf1b384f90565f2a8 SHA512 e5daf360e9d2c4efeae4084d9a72ac975acc09f95d0064f4d2c3759ba00a080ea5a2f689f74ce666633fae26d1afa095f29b209912fcae0ba38d9fc1231b74e0
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 08a7614d981c..99a72f2f1dcb 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 862ce67dc03e..35ab41ea9b13 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,5 @@
 DIST pycairo-1.15.3.tar.gz 177056 BLAKE2B cba4a212c3537d5718a73742468444b01372902d86f88558cf63ab2ec1999dac036b349d84dff0bdcae5126998c5e921f05bab54b708a29ca2381b8d1371ac44 SHA512 1fc75d193eacb976f2e5a594aa07409a0f80ccb21921065c1794961143785eed48be1966d2d2d3e2d0428f9b4e956994dd851d21f3c3cb91fbc27b007a901ce8
 DIST pycairo-1.16.3.tar.gz 188610 BLAKE2B 71034891bae636e23379a3fdc49c9163cff61183fe46c4027bbad3206e72255e60081dbc3cb02808d5c3840b618f6c12f8106ca5a08ddb226a65917ba2da390c SHA512 d60978f85eb0430f2038b0e7d0bce23602e8c180a7611eea424fd8bc3cdd8ce249af364abd0e77ab3b7ab439761721cba5c2398f51af2a89add3fb7fda8aa5db
 EBUILD pycairo-1.15.3.ebuild 1607 BLAKE2B 0fff3a866314ff4dcf9fdfdfaa865b504859be58ddbce3e7ffc64568d744b5ef0cf7558e045aaf1d9c474c457d9ce50c19c978b27accfe2e52e94cf00a3c9879 SHA512 a61afcf8066d8b14d1b117e7952d82d1265668005f976b20a1d53fcabf3d5bd792a62cc24b765d3113016f9b1870ad7e922d05ee017868fcaed03109866a9618
-EBUILD pycairo-1.16.3-r1.ebuild 1105 BLAKE2B 374130298e8dff7eec60c10aca71d1ffa100b5f257dfd4c78a07af3030b15c34d16dc25b160feb02569bbecdf8e92bc0af16ecf3b13ef6858ddf3afedfa67744 SHA512 a2766f7af185c6e51c4a04df7b27050f7f1b592f94f5b6788973d89f2be47266dedd675f9e35a824f0ddf1b6496d87ec1b220da6b6e669bfe749f36a5c09276a
+EBUILD pycairo-1.16.3-r1.ebuild 1102 BLAKE2B 04d0ef3d998720970b0ebf96b2e27a9538eb7801dcf887270603ad1042b5f355e7cebc71597666a102ee01a386102f494bcea288139dc1f9d8ca6c1a5be5470c SHA512 c7a22d497554eea2bd974510852751af8dfd2e35825c1b063487d8166c2d9a85636ca7c150cc761f2cc7a6586acea6c2f740fe8f76ab50415b59d06b70fd3b3d
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
index 8c80861142db..87b0b45f90e1 100644
--- a/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
+++ b/dev-python/pycairo/pycairo-1.16.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 2687d570972d..febd9f0cb9a1 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -3,5 +3,5 @@ DIST pynacl-1.2.0.tar.gz 3301645 BLAKE2B 7309409d7913bf1dee690a6fba5dd490de7a5cd
 DIST pynacl-1.2.1.tar.gz 3302051 BLAKE2B 96278368427c2b5f1d9508a5d9a36853a9c50390ee3ada20d6344e4f7f67fb3f1285c45794b863f129b48feff8a5a3d4a20796f69e832cec2aef26f27961d925 SHA512 15a3a84fed4d002072c185ca346c708ed0fb397ca3a8d0144caced635cc2e00e19603767cf9fcedc571cb4bf32c546141094ce44536dd117c3775efb2fc589b9
 EBUILD pynacl-1.1.2.ebuild 869 BLAKE2B fd945526b1743a72eb8b5fc2f0016847977ad6948eb625e35fc1f72d5f8d3b49e0c219ce686c9f4092cd967712b3a7226a8d5cc0dfa7990fe2914254781795b5 SHA512 25d6425bdcc61c3257285bf0b92a93adb7fb14167699b23b200f36690e619cd96c0edd9cdca8faafad3d9b625207471588b61501bd13fc4a843a8efcf0fb5c38
 EBUILD pynacl-1.2.0.ebuild 865 BLAKE2B 7b7d66da76d2a478e750fdda974b7cb2f4e8137799bb156365c802f39c9308c618ccfa753d169326536cfd9470f3ca3fcb907af7e086a6cf762f339ca6b7ca62 SHA512 cbfc77969f3435cb2d73a04687dbeb6e0383d48b2ca24dbaa17173e21cf0dbff7d76b227dc06d8dd62e0a475afd3e50ce624f4c99006c0d9ad3acefc7f57da76
-EBUILD pynacl-1.2.1.ebuild 947 BLAKE2B 2438a9cb2a58fffcd19f49df05f058636a3b38ca15f9e5e2675639e24a96f81d2160a659a4ac0f37a6877ed0d3ca50f5b901f9c949b96883555fd0050b80f927 SHA512 aea07d914639e0c15c12807209753544fc45ed7e98a162e66e471ae14903dd13c43a3f5d8d3dc6ddaf3e6419fd94f82a78787cbc6d8da28147137456297f9476
+EBUILD pynacl-1.2.1.ebuild 998 BLAKE2B a6386fe8304e3a967cb2c612eee5440f0fb72d20e2af34c85ef089b0db18eb29c72bddf65b9cec57acc9736727e220d21b4170651deedf58d00ed5234ccceec8 SHA512 fe3316b2604d54c2f7fa2c3294d8d04d576dc96edf7777a2f68dc606c55a556d0ebaec37102bfd5844a0555a1f7a05088d45d13fcb5f1cf0fc4a3695de859228
 MISC metadata.xml 831 BLAKE2B 39b921264053f9a7f18d9313daf7f3ef6e560eae777917098d8df976e3b9aede850f5073c190a9668440a487f7ac8fe2b6c1535271bb028596da0f3657ee0292 SHA512 8ae9c64a9477e03a593f40e4b5e3fe42adf2e80ab071b63be273c4cb548fef79f5e80ffcdb88786a6703dd28b8254ddd53428854419b669ca71322f7be775e27
diff --git a/dev-python/pynacl/pynacl-1.2.1.ebuild b/dev-python/pynacl/pynacl-1.2.1.ebuild
index dcdabef752f0..c762eaeafe18 100644
--- a/dev-python/pynacl/pynacl-1.2.1.ebuild
+++ b/dev-python/pynacl/pynacl-1.2.1.ebuild
@@ -23,7 +23,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/hypothesis-3.27.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.2.1[${PYTHON_USEDEP}] )
 "
 
 src_prepare() {
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index fe5ca783c1e9..449ffb0ed686 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,3 @@
 DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
-EBUILD pyproj-1.9.5.1.ebuild 710 BLAKE2B 7a5fc9e6a955025bf0b508e79c6ffc8930adf576cf8ac0a6646f02ab708079b3bb822bbb895b9bb225bcdd6a92f8e8a7bb48e7f5e898f61ec8a3eb6c7e01a98d SHA512 df1f732ee6319e53ba9aca794818b2db003bb7e51c5c276a4204498e193b4308b305b1befadf18c7baaf1b9dd100834dae8fe1b27a81ed1ca01c1dfd77dce4db
+EBUILD pyproj-1.9.5.1.ebuild 709 BLAKE2B a7aee31b8c1f41572601acde0b49210e34b16db67d5ba9d0efffc4407c92bc8ce933d34ccd47276d85a4fd069e9afbec9a90c1f72907b3c49c58464a2ebeed2e SHA512 6af03a9f2c9ca1abeede14e1e07ea0f3249796a0ae14a9eecf1514f46c62eb8b272192d0870c5a13737f83eebfd1cb48f90b0f57e7807e59668d379515adb109
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
index 78294d37ee3f..bae8fd871b19 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index b3c0bd75e048..d2a824833670 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -3,5 +3,5 @@ DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc59
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-python-2.10.1-r1.ebuild 1977 BLAKE2B 06efa137a2b74ecba71b7a42ae696b0fa873a528f68ca216d404f81e73f4088bed21338e97275e20c94a2a206f00c284fda5df91f0b84eb88f14ae276753f3e5 SHA512 af165c096785ced3ffcf5c0f0332b445c0e9c75102ee880e85a12d087adface591caa19b11b25d7626527ae35e952a1e645bf24f7837d3900d8e5eb1bec82c5a
 EBUILD qscintilla-python-2.10.2.ebuild 1979 BLAKE2B de320b5b36a55ae2d38a44a85cba8188acc74714fe635ddd77fd5875281f787da70f635c518526df0b3f47ab565c9799dc043f7be5158f03fb9426bd13cde2e2 SHA512 0f71ca4bed1f084fde43e3a6b3bab93510a8d359c5239e936f2f5537d10a51a6158ec2db1d0e7c06c491f944542cd48a24b293c823997df7c67c0941fc860d43
-EBUILD qscintilla-python-2.10.3.ebuild 1530 BLAKE2B 468794c93a97f20d91bbe6bcabfdb82a978934321be5afad31a81f19bae7877b21644648c7490407f6e4cae72a7816d0503f9cfa90ff688f474a83220293568d SHA512 7c0fad99f6959f05258a6f5dba489071f0cd53982fdcde2967b69d8589f6031e24e76ff8172453caae1f03e27ebf61e21787ca5cb625f5c4a1d2ef150e2003d6
+EBUILD qscintilla-python-2.10.3.ebuild 1529 BLAKE2B 2d9f2f49f270fa85db001841a045471d6e3ceb6b00e663727b0f81ae780e918ac07dbe69ae87b9e5c1438e9c2ca97afb6d7896a0bf0179e3fc42c8f8e1359984 SHA512 f915fc244b2af8288f451cc45dc23a42533f4c66c8f9efe42bc9c4a37e66d07fb5b52598086aaaae807a7fc13928f38ae2fb403851cc9fa1ef31e93d30e30dfe
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
index ab5f9388efba..aeec457cb344 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 53e3b8e3c09f..45306228e92e 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,5 +1,5 @@
 DIST rarfile-2.8.tar.gz 38204 BLAKE2B 27195b20b18e836f782477e71983e6600d1875d53aad99945e83e4fb5542912620f476ad07673341de13bcce2f8bf9282c6f08e5657a6f9ea348f40fc5fc399b SHA512 6d249b1be9f286185d37fc5eaeae01c4b7153bf6248e66285099f7b9f920419986c27b006fd5511ffe4ae6e3b5214956ccb37ce5be5fc2673880cd7b2af0f98a
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
 EBUILD rarfile-2.8.ebuild 448 BLAKE2B 16cec693d389a277ff6956b3f40b3b9685517400b14b5244f7b11c0082224bfe0405cc7bd4c1d9bbb171e5fbf9d1d6c3cbb8737b2b2bcb1b35be8b531316cfa6 SHA512 99c8a36364fec6f8f4824c678c4081cbb4fe4aa3424bda4c7583a5431e1ab72b882e5453fed33c24c666f0db0ded7a3e3f46fe3a930afedcdfa9852346c9fd95
-EBUILD rarfile-3.0.ebuild 453 BLAKE2B 936a7dab7b2a9baa338072846b2f7f060e325f009a519079707545dd69c1989bf701941b19a699f145b5074b1aa9db6773f9ccc9c1b3989bbf9bc6d1896ddc38 SHA512 3a504146d6e45426b01f5232874e53fa7ff76dacf931ab806941bbdd31765369dfda3b72742022160df823b0f42e3a0a2dc4dba798dbf17dcf433afca2aa3e7d
+EBUILD rarfile-3.0.ebuild 452 BLAKE2B 3940dd5c5d511b88e958a9ac6415991235b19a6c2ef022997e03971c5b1cc0f80461afd663618dd10274de39a0ca0c671c33c0df04c71614b7808086923097f8 SHA512 491dd4c5d101ceaadf684e85e48beb3a85d605dca73c45d0242d6d1221b61a8aae47f3a3549bed58418ba3112ea01d9dbe0e4b21a2b00a0032e55a01f844560e
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
index bf3e89942d98..43081f2ba218 100644
--- a/dev-python/rarfile/rarfile-3.0.ebuild
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/r/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+compressed"
 
 RDEPEND="${DEPEND}
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
index eedbe0bba069..9161b89c8442 100644
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@@ -1,3 +1,3 @@
 DIST robotframework-3.0.2.tar.gz 440465 BLAKE2B 912aef05655fc02b0ecc41fb435f97f473638301eb5c8b84e20833a5d33ffc7928c02d07cda0cc7d0854545d6b22025e5eb2ab7d550ce9a86d3ed18cbb468847 SHA512 b03fb3db627fd6b598615989c09e213cf79cbc7dbe7a08087c483dcc688f45782d54b9f1fa45206fc5adc43db9f2d862ac8f96c0b5f209ada1e09e5506171b4a
-EBUILD robotframework-3.0.2.ebuild 455 BLAKE2B b6f09de34bb42cc77f698c78e40f62cd56786a293ab44273f8ae18bdf114e19e3a1b33ede0ac02e680e634aefe883f0addd500ac297c752124a1a990cfe3c45f SHA512 51709fd9033907877775e3dff2766d580c1eb814ba77e606f71b9b192989ccc31d572cead37fb71fd6a66ac41fd6c2f908d0ec0ecd54836ac83f36c4d658896a
+EBUILD robotframework-3.0.2.ebuild 454 BLAKE2B 7c56cbc1541420a4af283031ac4008b13574e984c816d72a4dfb5ee961dfe1fe166d811ab861fe3005d808b194adefeec96827933e11e5e41fcc147c8321804b SHA512 4cfcf346d8a23f230eb6672308299b8b092ae6b7edfef4fa9639b1e4605467ccf6509c97a679d26425c0416abf955dafc9379255a9e306c59753ebe5130f7660
 MISC metadata.xml 398 BLAKE2B a5783e7341b4070040d6e6861126c20af2e3ddfc0a3dfddb537fad607ac469341cd30376e3ac7a236ea85987c36fd375566643fb65c9f59d2d19e486f1abd8a4 SHA512 dda41087fdeca9037dc39e9ad88a5b7e4ac8472d029a295fa5bab73a189a05ce70b0334d56fd1b45d45d1120fee2af16114c1bf5721b891df53d2a13d470d9d0
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
index ed5213cebb20..857138ab255a 100644
--- a/dev-python/robotframework/robotframework-3.0.2.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-# py2 only
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index b115b4d1e1c4..173549577f5a 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -4,6 +4,6 @@ DIST service_identity-17.0.0.gh.tar.gz 29078 BLAKE2B 4fcf8ab697d87c13268da880f8d
 DIST service_identity-17.0.0.tar.gz 23502 BLAKE2B 49218eb0c4021d7a69b09ca79d60b3f421c3c35b606de9bb47812e949b0f1284f0fed5bd9e18615bd569ea31b426339fb8ecacaa7e30cca0cb0abf488bea02f7 SHA512 4ba35166b520bbeb391c047b5fcca1dbf137a65e0624c92a6b6c2229f9521627be95195a8e502cbcc5a887d904598b1f0e63b47f6a38ee9f78afe13278d692ec
 EBUILD service_identity-14.0.0.ebuild 1164 BLAKE2B ce97b9cde0e64e37df5cb5b1c8ee2489e4b00c5de3fa758e8833c0b26933aea5aa8fd35a104a99e2764017e7eea9f0d7a6d18bf007f564643aa87f409db12cdf SHA512 9735ba2957261e86dee390d68a85c5c6d37eecdf156de79917120c52640d0ed2776ee2c1ac92bd92cda3d69ea84b2d2e6740b497c7064f201e47e923aab32874
 EBUILD service_identity-16.0.0.ebuild 1158 BLAKE2B 46dacdc7b22391c7e7616badf341264e4bc6ac7adc3106d00c5a5112c5142bd9c7159ee7e7e7e2f64f0039ddc55b69db120995fe148b710b24142e944541f2e6 SHA512 708d549648792a06790a78acabc476b68beb049a6502349ec03d022a0993b2ad59a543351d896691f1fbfdbfc32606a232c9561c1348a0965cba87897995a173
-EBUILD service_identity-17.0.0-r1.ebuild 1230 BLAKE2B 1a4d1f59e7fa87f23576bee58c07c6afb8e9448411bcf31fb72da1405c03f09bbcab80287f90d13aa1fc9af95dc3d5f545238010e1cd80ede4580bdc8845fd8e SHA512 c8a83a5d226e4e2b76132ce8c20bcc8ca24e86037ad09a1663258e1e69cd8ac926238002509280d1e636ff16bf46b9f1b4f900ef5022b73f97f248b8d4017663
+EBUILD service_identity-17.0.0-r1.ebuild 1236 BLAKE2B 186234051cd439627adec23dfe736ecee36f297ebc183f26eb549e95e0e3f935f1b98c775b0bbe95927dc575ac4693c7263a2bc7d7db4207a2ba46b34a5915f2 SHA512 4ec2d8acbd29fe5c3202da7aa5f62bbae237833ac8f51528c1aa1fd6abc0cd21eb407347464d7d02c05fe2d952deffc201d75d6a6ed7b6ed635e9369c0df45bc
 EBUILD service_identity-17.0.0.ebuild 1234 BLAKE2B 0a2bc5d9c0339d4b74edde232bf2a6ced0dcb202d8c64a7c91565175590f55aa49e4e223c3c77281dda8c1256813e54f1019c474f4e6fa270da5a9006fa75570 SHA512 320ac5f0e16c46d10d1951336df79667830214d176cb22f8474b008593a453885cca4e26d54f85912b9e1703688c1c9b777397d4e13862804768079f6b6ffb93
 MISC metadata.xml 392 BLAKE2B eb095e560878b45595b6b82e8acd6e07c89e68af20840190b09acfcc03191167f3efccace6debad6187c64a204191ab5036f40a4c47cee8a38727b24f9115057 SHA512 2140a0ffee3fee440a0ed3846b557ed7be08e4bf37be391ab3c3b7e6823e1f3a44dd30f143927e4fb75b50b029413dce3a69ff1cbaf640f6e5563fc65d9cb5e8
diff --git a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
index 5834a6b947ef..cea820ab0688 100644
--- a/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-17.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/service_identity/archive/${PV}.tar.gz -> ${P}.g
 
 LICENSE=" MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 7960d243b6f8..4a4e99a4db59 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 566 BLAKE2B 4e3ed08799de2385b3e0b099d385b53eaa0a20a77d91c8408b97f2e183a89ed890832cbb4e7680ea5d8a09697567eea491d1be3e06dcc2a23999458fe0f28a7a SHA512 0b78682d420213a92cb602b0619e340fc8a043b170bc37747a92a0973a81645ed1c4a20f5800a07c5f70f05e1599a1024ae5233966d9ae3167fe31fb6d45309e
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 572 BLAKE2B 94e0f99778523d7766d0217dc67ae53167d761019573943cc19d6ef4ae145971eda9bd0f42ceb74782a094aab433a1a8e81fbe3d740062cded7b60b8e6398692 SHA512 d386ef66a19314a7128d8bb8fa092f2446edb4db8da43645bd200c574831653e0e9af94dffe3818026de7d6534fc51297b0b37b19afdb299ae11ae9df4ac3cd5
 MISC metadata.xml 593 BLAKE2B d8e69d801973c15666c838797ca8b5bd746623b2bb2915db38e4b7461757abd2ad6dfdd95078348775c0494dfd19dc5937337b3cc9966bbce88a3711f014c3e7 SHA512 21771b0ca9695c748fe0fdfddaff603a296c671af1d1e7b097fdab104eaa33ea61bc4ff887f27f94cf0a76ff9a52ddbe7055167b5f651f954e78f318a7f9d9df
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index e996cfc74c72..76b5106c8b46 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index ba1b6bf281a4..8c0e077b7e82 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -13,5 +13,5 @@ DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-16.6.0-r3.ebuild 5710 BLAKE2B 4546f6bf699eb003537e9c62959aa2c10fa2241069058949bc20aabeefd0e0758db72db46fe465a0d4215f83ff4deffac4425498911644913f278dd03c39ca6b SHA512 bdf83812e1bfae0a09dc8ec1783173a1ab43689fbe1b2421dea3289a5df7181c3d54aa010e7c4906dd056522faee7c49b1ad43426f3b146c3b35d58da9f0767d
 EBUILD twisted-17.1.0-r2.ebuild 5740 BLAKE2B fd9fb6bda70198bbd29b94445e67ebe6406e2d478094c20b012493691854d68bbcbc08bcb2777b1e29a54811dc159142b62982836530e3a842518dac16cce67a SHA512 7262676cea7fcb550f60c856ff0a1e864a9f6f3eb913d6b8f7d0ef1267bcd3973101cc531237e4de458152140878618dbce3837aa9129b4571ad9f5fd6851b65
-EBUILD twisted-17.9.0.ebuild 6017 BLAKE2B 98d5b9890447814a726fac7ed8071d52d2fd1276cb8eb42fba1110862dcf5218d873e416490d45a76408b5b38ff3d30fedfb65bd284ab081d94a749b26126c36 SHA512 270140ab20064d4ebddb1b5c4c2d3771efca222bf6ccffea9660256e1c640556e3f19362c0126c8c6bc4c97ff15e34d23caee9a2f3ea004cafe8fdeb553af15c
+EBUILD twisted-17.9.0.ebuild 6023 BLAKE2B c092bb63f3d3c18b9e2c6588e81f8e809b1078c4f9bedba07b3dff494ce2d34766c53ca719319a46ac76e9a293523e660e627d1bad495bc776608d36632ad5d0 SHA512 a855238ba5a2a86eb9792fc00888351858ff0846c3d9339f79afcbd1610af962c5e15cc9e0075714e8c58222ea0946d1479a03e5e93d69f4d29466b38fe6f8f3
 MISC metadata.xml 1429 BLAKE2B f6bf7279da38a837c80fff9f9319d5c2d3893fb4a5a17d731b170153d1c4e10479b58a6576d84fa59ae653794aa017862a4fcb11bf1bc6ca85c374e3b9dc7cd5 SHA512 1ddcc6bb727f97eacb712badf834ceca15a4544e340090622774bc0e781f2ce1a20a96f8b5018535998e9865204697a25ab84eff87c480246fe14e39ef9411ed
diff --git a/dev-python/twisted/twisted-17.9.0.ebuild b/dev-python/twisted/twisted-17.9.0.ebuild
index 5de764748a8e..d6a8eadca42d 100644
--- a/dev-python/twisted/twisted-17.9.0.ebuild
+++ b/dev-python/twisted/twisted-17.9.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 
 # Dropped keywords due to new deps not keyworded
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 3bc50486a95d..544bbf6b83ff 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,5 @@
 DIST urllib3-1.21.1.tar.gz 224266 BLAKE2B 35f521698c0b05fc9122650dde5ac00954eb2ad99ea3771d2a9e4fcb210b404a8173ee369f46b5e61ef7104621571386ad114c833522748b96294a87d0afa601 SHA512 0d2e9c2a0b895e4e232cad5ecc645ea9fd9b70191df045a220ee1f32e284c613c6790bcdfd9e40a22ea9d25ec397278fa700a3c3747e7b04222719d50df07859
 DIST urllib3-1.22.tar.gz 226083 BLAKE2B 6d3067ea1c9c90e2e759e6319115ed3d29ca1e31c4d1721d7e7aeed432ea4df22635d92fdb9ea91a411bbe67c72160abaa19e0d42870be0b0a866c003db6ec62 SHA512 132b69d7f390916bdcde66d46fbf0189d0c1f976f91778dcb0a9ef8174487b7bb4b37b9139e84f7c70234803be95284448aba0b820f3b54530c0c497ca7a1dc9
 EBUILD urllib3-1.21.1.ebuild 1639 BLAKE2B beeba41d094abaa84abb1be45a9a53b430140c55cc16aeddcbb29ee94a892458b8c5afe888923daabbf3a47030edac6b9e0b8246c6dd1c72365fa4f5a9c4055c SHA512 548ef7d2b368abe5bdc38b91d815cc8c4fe679339fc7b918d45ace213bd07af57050fdb0ebba430e7a9430f70884036ee4abfd5f3be4c57fd88a0acf84b84550
-EBUILD urllib3-1.22.ebuild 1745 BLAKE2B 169e817f09c3d61857a43d6f17e15f575ab93328708f1878999c3ae992b6d9bf8919e9bfd5cbe75bb611167895e118f6b56872b7c27b340c9d824911c4f3aa68 SHA512 6fb1b866d54cc1c61eee008f0adcc1c870582cadc77df8bd41c6d608f610839e1e3620e620545a79e8c36af5ab00b0a959c90422dfada3c1db9a7c301359cd0b
+EBUILD urllib3-1.22.ebuild 1756 BLAKE2B 208cbdb5c471fdbc1bfb74225f7498b2acd2a00002567c50c19778e739e478ea5c79590ab6f6a3cd7527d64d24376a727da44ea0db0dc90f8f35fda2c6555c69 SHA512 c8de52464aac254d6a47d0c4bfabb83d8627ca69dc50e586bdf18826a70111f9c9e5a29787f8e0aac825725e5a918df7df26a9fe566bffe4061ffdcd7a8dec96
 MISC metadata.xml 376 BLAKE2B 2e9ba1b23bd9ab2770d23ce9bdf21f4083f46184c22d1dc0bd449b6605c24a2ef0168e1503327b549ba55e81b7bb52fe5f73fa375f06f3c64fabfac6cf5a9d77 SHA512 97d216a4841d8c78655c923060a0040b75fbb2d19a42e51081fc63a4af80514db5abf09a02706cc52387ab7ac72e964f947f1ded50bcc7f8fae6d022d5353543
diff --git a/dev-python/urllib3/urllib3-1.22.ebuild b/dev-python/urllib3/urllib3-1.22.ebuild
index f124faec6ff5..4d8d60b50567 100644
--- a/dev-python/urllib3/urllib3-1.22.ebuild
+++ b/dev-python/urllib3/urllib3-1.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index a4a7407ccfdf..61aaa6bd8078 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,3 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1.ebuild 848 BLAKE2B 5bd21c6a1d30ad3ff9fe8cb6b61850fbd0665d6cf60a70940f32329f6abb6a8fdd513c759d1ec8c375cca0bf6d79ba5f68abef916a9d0f1885467e23725a6530 SHA512 c525d06bb3a9e4022fcad783127373256a86b9d35f783a4f5ce82e07fb5a1e45e38f99fb048f1da1f021043716dc1f116a5222cab7465d524202fe4e8062ce58
+EBUILD webencodings-0.5.1.ebuild 859 BLAKE2B fd91f94510d0f9d7cc305be3a45095367072093c36843bfedc8704599122cb12296092da7361980199f42aa1a9e87cd1b3f3a050e0cf4196c5ebbb55fb26f8a9 SHA512 9e95b0fa055012dd93a1f85ac9d8c83f036ffc0e3b14a472f46386b007cc2633ff1cff3c2c162732c44c151387e527fe3fe4fe0062a939602a2d418817cc7436
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index 42e9b30eceb5..6bab989d36cc 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 6848cade6283..0b843618eb93 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,4 +1,4 @@
 DIST xapp-1.0.1.tar.gz 12327 BLAKE2B a627a833adc8ca32823d4c04fd65ef3dedc2eedd031c3030105f1f2341fa17744fc81c976f4eaa1a238653392510d416692ce804ff5bcfe9ed12d9595245e8d3 SHA512 7dc4db03476f6972f6452800d2ea58d7f78d0bd5dd6719f2b49d1c2e3315c3fa09c294b1195bebd26357c30b4c43d7e5c01d160708dd17ee488b823344895e25
 EBUILD xapp-1.0.1-r1.ebuild 535 BLAKE2B bf23bcdb498a22afa47cdfbafd61f2f6474512337e894274bfb078902b62365a17474fc36ae4b851316c9b45fea3e8e1dedc78b7ba0130b7830dbda626b2c257 SHA512 131ffa68263374b5726774799516c78c5ac3a6a61bf1447f70c7b8cc974d9b41829959438e709259502447ac63ee75730f048d96deae1bfae4f3a2bb1e2c3de6
-EBUILD xapp-1.0.1-r2.ebuild 550 BLAKE2B 6ac0054452376b5a8856937fb22100dad8b00ec4d9ba496483cc72fdeb85040848e9413ce2e4d5334f5956203e972a3aa96cc2904ccfb2c57c919d4010c8f824 SHA512 806b450fa6e7228787f4c0cb21886b9d2bd6bbea6077ca870b5116df7cb02e537f896f6073b60e7ff7976a20f3a80624ed7a721c0d866490e47d96907f076a73
+EBUILD xapp-1.0.1-r2.ebuild 549 BLAKE2B d5b72b43406ac436b5a44b5780372dd9871729a7940d9ed9629e14f0d892f64bbed2404c799a3082f4f71eb6d113ad22046a7b4a3ae6c95f06c818f1e30cf241 SHA512 6fc2c52095d0d7db506ebc478da62fee94c77def039f5f65ef3e6eb0a0ccd4a07c459b7cc6391b9120a385fb2b7065275b7ef63bf59d24c24d7c4b078c04f927
 MISC metadata.xml 220 BLAKE2B 3d3008b71006a64b0bc1899c37b1ea3c2048806badd09c02be51a29f1481475c704c5561d84f7caa1905c57e94e2ebe787839bb23b647a42543f31a9d8bf869f SHA512 1aa3933bda5909c7e7907b7c5218f4c214f5ba411fb8fc373e35ee2f490e4ab8a7813549c127b916e3c8b9527853a502fe298af1aa7139c213c2f31847120364
diff --git a/dev-python/xapp/xapp-1.0.1-r2.ebuild b/dev-python/xapp/xapp-1.0.1-r2.ebuild
index 5e6426fce4e9..d93169660ed2 100644
--- a/dev-python/xapp/xapp-1.0.1-r2.ebuild
+++ b/dev-python/xapp/xapp-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python-xapp/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/xapps[introspection]"
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 1deb2e0f709b..d310ea6aefb7 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/actionlib_tutorials/Manifest b/dev-ros/actionlib_tutorials/Manifest
index 65bfc8d99a7b..21c9795fdb9e 100644
--- a/dev-ros/actionlib_tutorials/Manifest
+++ b/dev-ros/actionlib_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 DIST common_tutorials-0.1.8.tar.gz 10591 BLAKE2B 7bf99e6a46ff52904f34f0b8e226dab10634325531ac736e530499af43ad1f1ca62168e476ef6ea9e33007c883804220b512e7683fed36e6940017624031f0ac SHA512 a0a2e8a7aba3415bf133e95e7d1b72cf5ee81efa962003ccaa2108fdfebd2a03044c60fd4daf73ca69f3a2975bd7fa9c60adfefc32d1b048da11e65aa613607c
 EBUILD actionlib_tutorials-0.1.10.ebuild 512 BLAKE2B 7e2a0e2ed6aa9adf69a5849c508a2da2a4944a2d5b09eede252671bd63f33a2f9af594783f852e4ebd2fe07537ffd378503fc1572df9b4d0a56386dcb1bac7be SHA512 80a38d4b14640d3b58c5ef893fe7627f4846a6d764fb4764c70ee7f92ece5d81e1f896f627f31e73a06d3ee393346911c9a6965e4b8bfc10cb166422f2bd5ecd
+EBUILD actionlib_tutorials-0.1.11.ebuild 512 BLAKE2B 92df94566b70d1f99559947535f819591265b978362df63c059fd16e2eda367e48a375e6251cbedc5319488e750c893c38373f27ae333be9b280fae4bac969cc SHA512 886a1c079e23326fd10bc0c11eccde179f01ac32d8862804d0bb4212442c581c51149338b7319b924bb7589fa14e88cb3ff381321fdba268d073b7d5c6eb0bf3
 EBUILD actionlib_tutorials-0.1.8.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
 EBUILD actionlib_tutorials-9999.ebuild 512 BLAKE2B ff7e8318b4c18367c57cfa021b3eea87048ba13f4086bd62d3b43e21eda3f269c713f2d227111ae7729eb955878ca74c7e8b6b2eac51c68afba60e6c9083813b SHA512 a64362ce1310e632f5ccd88cde6c53a3aadc4df802102680e37236191a7e514b2f3b00c5a326a17102a37ecd9732ad5830afe2079e3a41262b684233e7be241a
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
new file mode 100644
index 000000000000..a2c7c31051fe
--- /dev/null
+++ b/dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Actionlib tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/actionlib
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nodelet_tutorial_math/Manifest b/dev-ros/nodelet_tutorial_math/Manifest
index acb78df5fcc3..ec86d63f6f83 100644
--- a/dev-ros/nodelet_tutorial_math/Manifest
+++ b/dev-ros/nodelet_tutorial_math/Manifest
@@ -1,4 +1,6 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 EBUILD nodelet_tutorial_math-0.1.10-r1.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
+EBUILD nodelet_tutorial_math-0.1.11.ebuild 448 BLAKE2B 4316d0a15fc1c88f0b262ac23763cb46a77f6b6b9e7541d234ca6145ebbec470b4af221b38e39c1ebccf3caa9392b8d2e28ce0982740cd49e0dabc92a65fea74 SHA512 86d106c5368e526982747e5418b95fc8eb43eb476fd9e2046216f7ee375600865043c966947bcc955f61dd0bedb6eea57f21df471c18609a884abaf8e0503536
 EBUILD nodelet_tutorial_math-9999.ebuild 448 BLAKE2B d6c16e8f2a00d7ea2236a37ccd43aed770dc14bdcfb64f5e3cad61dd6367949d25d7fce02e0a44e4dcf5640d1281549258c892ff44077ac552e51c6a811ed85f SHA512 f14ea87995d783070c17e453f2deeaeffb5ee6fd73cc6d0bffedef17c5e29c0bc5a2fe0f8acd249d56b53238119cfb5de2af21e3d525852141589e7643ac557c
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
new file mode 100644
index 000000000000..53cd8355481a
--- /dev/null
+++ b/dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet tutorial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 4f628fdf7f66..981f5f778cd7 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,4 +1,6 @@
 DIST perception_pcl-1.5.3.tar.gz 67101 BLAKE2B 963d65d348068e574fd0d7431597409d607e779f017b3a645b1add5599baeed559898e5a9873d6b3ead6ea812cfda80b96f9ccfea482801b3c76d17bf234c26b SHA512 e34089f48cfe40f0209a7d4a3a0fb2402c1d1fc35bdf7a57970374bcec50185efcbb1e56b08ee64810a43e83fdf7e45ecddd09ff9660b47399b9f751be80df8b
+DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
 EBUILD pcl_ros-1.5.3-r1.ebuild 921 BLAKE2B a238df0cf240f8d76b61730f8212caee5388e1a66f75a725955db47a7a516a93762ed7a93d15ad90e1f3b8245c460c66de57766b2f542d9dbe371086f21521ea SHA512 0edd4bee0a0f7dceb5daf4e90e644b0dee09d0d902a62f863b04607e06fd02dbe03e5299cdae4352e7335409c5377706daebc63e101cfd80e3b0f7d0cb17d163
+EBUILD pcl_ros-1.5.4.ebuild 921 BLAKE2B 7dcd0c3e58fe62dfecac6163907a1034a8a1e3e61660012be8b68ce12ab2177d198f8f737cd73a6b28caf8f6d7c6e0818b8b70d0e0c407e64165358b5027efcf SHA512 ba2210fc75a197d53ac011edae3a5e76e103111bfa1e096498112361797e5d0f3d493fefa9c41fc56c2c317eba3b2896f095212c72d7fa92e5b76f27869b3fe1
 EBUILD pcl_ros-9999.ebuild 921 BLAKE2B a238df0cf240f8d76b61730f8212caee5388e1a66f75a725955db47a7a516a93762ed7a93d15ad90e1f3b8245c460c66de57766b2f542d9dbe371086f21521ea SHA512 0edd4bee0a0f7dceb5daf4e90e644b0dee09d0d902a62f863b04607e06fd02dbe03e5299cdae4352e7335409c5377706daebc63e101cfd80e3b0f7d0cb17d163
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/pcl_ros-1.5.4.ebuild b/dev-ros/pcl_ros/pcl_ros-1.5.4.ebuild
new file mode 100644
index 000000000000..3cc2a20fbcf2
--- /dev/null
+++ b/dev-ros/pcl_ros/pcl_ros-1.5.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosbag
+	dev-ros/rosconsole
+	dev-ros/roslib
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	>=dev-cpp/eigen-3.2.5:3
+	dev-ros/pluginlib
+	dev-libs/console_bridge:=
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-ros/tf2_eigen
+	dev-ros/nodelet
+	dev-ros/nodelet_topic_tools
+	sci-libs/pcl:=[qhull]
+	>=dev-ros/pcl_conversions-0.2.1-r1
+	dev-libs/boost:=[threads]
+	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib_tutorials/Manifest b/dev-ros/pluginlib_tutorials/Manifest
index e268ca404bd6..680ba28c61b5 100644
--- a/dev-ros/pluginlib_tutorials/Manifest
+++ b/dev-ros/pluginlib_tutorials/Manifest
@@ -1,4 +1,6 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 EBUILD pluginlib_tutorials-0.1.10-r1.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
+EBUILD pluginlib_tutorials-0.1.11.ebuild 427 BLAKE2B 180959bb51bdd65436cc3e727788d16d58e096aebffe0c16f852385f30f996adf7a72800f370c0e43090bc3f9831c773afc8ded727aab4320fb7c814cfa75f3d SHA512 ef29b01d5524e9c69680a1fad1eb49a514d05fe98d39219439ab3cc36318d1301404235992c2312a635505cd677c513308a7996539fdde2f98b2d1a89812bc70
 EBUILD pluginlib_tutorials-9999.ebuild 427 BLAKE2B 9034636d57edc8b2cf501cd86a074e5f1975c7b1298926e7758384bcf471a4b61f0185204131e3aedb003e4db87ee3cfd7eeb8b36b044f24cdfd2844569ac1a5 SHA512 5105134c0ac368dde546a0de13202501f73c9d7f538c04f834f89ea858da5dac2b0a04f4df2f292cf198106256d57bea0e9d8ced7324cbe559a6356b34098cb5
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
new file mode 100644
index 000000000000..6814fa431ca0
--- /dev/null
+++ b/dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Pluginlib tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+		dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_migration_rule/Manifest b/dev-ros/rosbag_migration_rule/Manifest
new file mode 100644
index 000000000000..5cd5bdb12c29
--- /dev/null
+++ b/dev-ros/rosbag_migration_rule/Manifest
@@ -0,0 +1,4 @@
+DIST rosbag_migration_rule-1.0.0.tar.gz 581 BLAKE2B 6007438d1fe762965ba58432519c6e85903302700951174acaead513fae374933cd2eed176a996344aab3ca29be19fbcd231f216e83c61669b69b3dd1af87cb8 SHA512 694e272509384d48277400639614464e8cf0e19766a247c6ad71399fc6b4aabf570e425d61f78bac2b712c569762a25ac3539390b19317109972cfa6768fecd6
+EBUILD rosbag_migration_rule-1.0.0.ebuild 370 BLAKE2B 7664b1e04f5fda1f3d6e0dff26534aa0f4e945e7fbeea3b73a557ab965ba68d796ee6c528181ab4236561f4256b6d35594e00f7f6361fe4759ccf7a9222b9994 SHA512 b404025afb23d7d843d2d27a897151f7d9e03f966ed34708f9dd84cd97682d7fdf8efd4aa87f8d417e2fd952d234d76b62e8bf8ea72710b3f4176f9ba1021ce7
+EBUILD rosbag_migration_rule-9999.ebuild 370 BLAKE2B 7664b1e04f5fda1f3d6e0dff26534aa0f4e945e7fbeea3b73a557ab965ba68d796ee6c528181ab4236561f4256b6d35594e00f7f6361fe4759ccf7a9222b9994 SHA512 b404025afb23d7d843d2d27a897151f7d9e03f966ed34708f9dd84cd97682d7fdf8efd4aa87f8d417e2fd952d234d76b62e8bf8ea72710b3f4176f9ba1021ce7
+MISC metadata.xml 348 BLAKE2B 5e4beac8974cb81a03216fce372aed0492093f44739c8e0bd48b17a58c0da82c86af66af991347103e82f6169c1b75dbdf0a9cf25186ba73c7dcf7de1d4491ee SHA512 416df5a85e1ecb895ce36ef56a21b48fef55c86d75dce9ff043ebec037daae71675f81d9465599219c6761de1575aa6ab306e644440ee7f3de1095edc73125b7
diff --git a/dev-ros/rosbag_migration_rule/metadata.xml b/dev-ros/rosbag_migration_rule/metadata.xml
new file mode 100644
index 000000000000..a1c8195b39c8
--- /dev/null
+++ b/dev-ros/rosbag_migration_rule/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ros@gentoo.org</email>
+    <name>Gentoo ROS Project</name>
+  </maintainer>
+  <upstream>
+	  <remote-id type="github">ros/rosbag_migration_rule</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild
new file mode 100644
index 000000000000..41c130018493
--- /dev/null
+++ b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-1.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/rosbag_migration_rule"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Allows to export rosbag migration rule files without depending on rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
new file mode 100644
index 000000000000..41c130018493
--- /dev/null
+++ b/dev-ros/rosbag_migration_rule/rosbag_migration_rule-9999.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/rosbag_migration_rule"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Allows to export rosbag migration rule files without depending on rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_actionlib/Manifest b/dev-ros/turtle_actionlib/Manifest
index 52117897b27d..23d37a11fda7 100644
--- a/dev-ros/turtle_actionlib/Manifest
+++ b/dev-ros/turtle_actionlib/Manifest
@@ -1,4 +1,6 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 EBUILD turtle_actionlib-0.1.10.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
+EBUILD turtle_actionlib-0.1.11.ebuild 634 BLAKE2B 86fd2f1a690b9eb1dea0cf798c3befb1609b67876e26673cc0f7cfa8415dc4c52a4d781a6879c0092b53c1f67d22b2abc79f82040cbd3756f3a9a3709efc98d0 SHA512 9415ee6698ea4f3b7d5c78f6fd606f1d1d22ce9ffa2df0d13bf015a7092847e91dbfe018c2aebcf7cc09f8c1d308b45278945ebc753f2d155aaa629fe6031de9
 EBUILD turtle_actionlib-9999.ebuild 634 BLAKE2B 745ef90c77f08d117725b38f0773985a73d598a4a91f5babc665c37d1cf2c60f4322599ce04145bcb1cb8152b42be0c4dcdc42009aa35a7895037b21eab9ab6e SHA512 2a0ef4ee5450238045a2e5b35b65617b34f2e64cb9806ebf9deb875f34f168cea16a71021361a266293710c1621da2f7cf1afeebc111e9460809b63efd2d5324
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
new file mode 100644
index 000000000000..24600b2d603f
--- /dev/null
+++ b/dev-ros/turtle_actionlib/turtle_actionlib-0.1.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write an action server and client with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib
+	dev-ros/actionlib_msgs
+	dev-ros/angles
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/turtlesim
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 197e673ad828..3c8dd8b31637 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 317a6509af9a..62bef7c7849e 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,3 +1,3 @@
 DIST cool.io-1.5.3.gem 112128 BLAKE2B f343ee73e3796744ec21d3af13e92a0a462e10b262543c2d77ab0dd6c5250bbd6cf0d6579646d146983df1c2b288717f3d4e9f1d5d0cded58a9b1422e497dee5 SHA512 6ef61713acdccf951ebd64018a3d9ec83e2655895994fe23842e18cd2556f4d35ec42144577a83b30ef369a9047a58d1bba2224145653db0b7c203dfdca6c3c3
-EBUILD coolio-1.5.3.ebuild 1442 BLAKE2B 7580cb65ae5eebe67e830a37f8b2d3b956cffafdd086e36727f927161af3d086a7d40ca8ba0469f80a94be11565e53cb8101d96b49ae67bfd2e4956613a71e68 SHA512 e12364826839d88823e1c140a978b06e6806b14738359b60e2730bc64d92a726e01b120afa1aafb7349da2d7a733782952c33eafaa1da32acbe871a2cf473da1
+EBUILD coolio-1.5.3.ebuild 1449 BLAKE2B fba86e6887dae5d42868a371c1268a3a55f519eb240cc6f49a5a2518d056e953817fc9a3e5ac6951ee5ee18351e87ab9614c02aa5982a77259ff18c421dcf94e SHA512 e9cdebbb5f1e0a5718102e0d6218f83ce09584b2f19a843566dbe7c74da7c2a4762c82880ac9d8820751c1a5262c36f52b65b4c50bbf5b6756b90d878a469083
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coolio/coolio-1.5.3.ebuild b/dev-ruby/coolio/coolio-1.5.3.ebuild
index 2bee88ceb582..67d0237c3382 100644
--- a/dev-ruby/coolio/coolio-1.5.3.ebuild
+++ b/dev-ruby/coolio/coolio-1.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/http_parser_rb/Manifest b/dev-ruby/http_parser_rb/Manifest
index 2de36a06bceb..05f5b8e351bf 100644
--- a/dev-ruby/http_parser_rb/Manifest
+++ b/dev-ruby/http_parser_rb/Manifest
@@ -1,3 +1,3 @@
 DIST http_parser.rb-0.6.0.gem 177664 BLAKE2B ecae9e862454584759cbb3158eb16dd6de09fe95c6b38099f1c6d4be2376ca1d3eb8a6713994da600c9c567193466da30f4784652e19ad796891a53d67578fff SHA512 51c29bfc85de8cedb4e98fec84c955252556abaa4d0848fbc38b232879ffc946c72acf38440e8e9f1e31a8b734a68d43a96924af5f48ac4f1a054153ec913a08
-EBUILD http_parser_rb-0.6.0-r1.ebuild 704 BLAKE2B b16b567cde0c84f99988a37cba0542b9877830ff7d4401ac6c5558b11c28eae65ea1ab4728a4c93805333d702cd605d60c7aaf675969e57a526818d12c73cced SHA512 f43bc9b1c2a80a19512707f3e1e2e8533cf73baceba3a7a7c79694102b52184b3059f9357a527a4317c3b8b0385fd9957c999d556d170222599925babf42c496
+EBUILD http_parser_rb-0.6.0-r1.ebuild 704 BLAKE2B d0580d8e1b8d2fbb232b64e8301f6bd748662c0ccf88bdf0cc14b8763f1c20f2421a84dc96951a29388e63521a3800a23910923f988c16e592f3b389db7f2ccb SHA512 4d476d0f40e914b79b9f9c1eaf7beb0fd2b203c7497a733f5fae2ad32bc5e78b9a32e5acba64790a3075660e0657b0cd13863054d9e2d1b6adb420e984ae547b
 MISC metadata.xml 345 BLAKE2B 8305f5931644b1a23580704e713a643f9ffaf40285edba69bdcea258bedbbbacf3486fa4703e4989b7d727b874da12726b970d46781ed72093a349911468de68 SHA512 86cb5c3b5137de6cd0792a3bcda1b028e3dfbe349d7ee7bb4df47b47a796469213681bb686dcc0fd3132b44b78366c11757d922d633607915dadd40faa6c3453
diff --git a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
index 9ed6d8d80822..0c7960f923d8 100644
--- a/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
+++ b/dev-ruby/http_parser_rb/http_parser_rb-0.6.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
index cf201f938beb..34a8e1bf45a9 100644
--- a/dev-ruby/iobuffer/Manifest
+++ b/dev-ruby/iobuffer/Manifest
@@ -1,3 +1,3 @@
 DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
-EBUILD iobuffer-1.1.2-r3.ebuild 937 BLAKE2B 7283177699e44ee3941d356a5695d92fac2ffa12b29d7179dea6f7f59ff3d1e80d9bccaa5ba44e7ea35098d2db06a12636c70ba36aff9e5e4f6f2bf199fc970b SHA512 3b3a13e332fa8205954593ff75e19f20dfd3a02b7b9bd1c275721c566859e20fdbcf53ca44db9f08baa6b82ba5729d6c1d67c497a5691c53ffde91ce99c286cf
+EBUILD iobuffer-1.1.2-r3.ebuild 937 BLAKE2B 77e2f5da3ff30426f36960121dcd6e6ecd7da665fa1b04c88a33a9edb58485fe9c42ab0dc8cfd405493c932a81dd3424b409164cb83627ed4a8e5d8913029b1a SHA512 2a12ac0a29c1fba99810660e666e06832c37d0aa034b44075fdaccb717d9f085fe06d814b6b07830a7ceab71bbb8f2b92a8a3ead5e26b1e7b08c8fc5a8bf3472
 MISC metadata.xml 343 BLAKE2B 51e97a0c05cb72583d5bf370939a36d0e5b263f3cfb5bea00545260992d6f216ea15fae876a767d7f91c4732b930cad86c0bca8d95d435c7209763c3d8b0307e SHA512 2dd75710c00d7a9984d85393bf831ac8de6e891799f9d0b7414f87f7d89e6b0e149e25b1061ddc92f7a3d941691b5b7d6edaee4f0ea168d36e9d0ef5d25aa606
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
index 158cdf41c5d3..836cf7725013 100644
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
+++ b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index b2d339c3f683..db6778f855bf 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -3,9 +3,11 @@ DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11
 DIST mocha-1.1.0.gem 87552 BLAKE2B b09721474520b57472bc54eece8ea27f0172e49ffbf43802854c111632673d05f35931150fe83cf83862471b606c70e8667327f491d280f3cc3d059e752ff0b2 SHA512 5a07c8364ae649a6be821c4b61c349d79e1dbf1e574ed95b07848f5dae3a2860e2f2e06499fc15b8352ec2146f273cc40ee8e65e670214f0f0669b6eedf698bb
 DIST mocha-1.3.0.gem 92160 BLAKE2B 10ffd1bd9b1ecb99555490b17451ae883986ef17856fb401165bb5239a2c07af2532b20bd62a5b1d8dbdeabda830c01179a025174b890be7ceff238fd9a67dad SHA512 a24de9129da65f6b37f06ad888fdb80ae987f51594980991a6ac3ffd23e9dafeedd7a2e758835f33f4de59e07b7c39449e3a49228159710bd87a3de7d3df6a3c
 DIST mocha-1.4.0.gem 92672 BLAKE2B 8b8640038da40f2577431630ffbc773f5a9474a3a872a5f6c26d53b41d2827da59f32f6c7abab78cbf491bb6d58cabe0834e4b1706869cedd1e72f116817537a SHA512 54953d815cddf52deccdddcebc9a9880fa2f14cab9f4ee1e164bfa3afe095d56b409312149341d1bf84fb336ed23512e7acce371135f8a2a1bb16f1de7acff1d
+DIST mocha-1.5.0.gem 93184 BLAKE2B fe29eab462db2283449587324fa7c607c84bdc6cf8106c8714de29ac2ec8aa9352ed0ebe60a5f8ad05e8ed9a1256f534c352b17f9519de79490a548468afeb57 SHA512 dd4e37f2d3e65fbaafb9bad345419a042682c5db33ee1787b65db1d0889418463d32c87deeddd2b953e0024ea55a5a36b816712e94b4ca740a6163c6ee51dc85
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B ea0c96b43633f7b6dcb242224146aecea671121c49049b96f1816b76259fbefc0916dd88c3a25d9484016ce1639c9a4796f3ef7e3c582c9d95bcfa925ea6df1d SHA512 1d03a7eb194ffe9b086ea3cead434824effcb92a9b927ee8938d052e36663283037d9a88604082ca4646c139ff3228208bbc494877a9f0d562141c9409097f70
 EBUILD mocha-1.1.0.ebuild 853 BLAKE2B 1e239f2abd34221cee9af37f775c07ed22285c3db09695e6a175a86bbbec786046e80efdaa490959144ca5e5853ffd40faae3e1743991de9df1636da153314f5 SHA512 a1f48fa4bb83754b1d6af4e5d50ed63c404c6b1e788a4d83ec2c190813b72916d73de541ad97cedf14073444aeb4bdf4174411be1fa6aa66eaf28b124b9a67ab
 EBUILD mocha-1.3.0.ebuild 861 BLAKE2B 087b553954eae1c73a77ddd5fb50d96951e58a42ac35f5c76de92606f49253eb64aaba9822709402501f7f88d0a1d5498a60033e81bb14fcb3750712ffc35ae7 SHA512 f06e0d7a05935b6605b4e2a9916b684d0fbe12e25b73d6042fc8185a870f07982f8f0088fc0fc17cdeff9aa73e00d9044f95c721f3de1d453193c8eb628524c0
 EBUILD mocha-1.4.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
+EBUILD mocha-1.5.0.ebuild 868 BLAKE2B a3f08dcec677979fc2fc3daeaa93e15ccf712b6d9e72959ce5f6f5fec7bbb0ff3fa40fcdca9214f9b8df64c8cce6e3bb14cd9eb0a9fbe9ba9ec6232288c498d5 SHA512 2140cabf3e252fbdf6a15817130c5876ab4bab69a79097af5de290ff36d9381616e3e995a9e21867c36d95d2afce788f3e417d20370655fddb29fe1a2057cdc8
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.5.0.ebuild b/dev-ruby/mocha/mocha-1.5.0.ebuild
new file mode 100644
index 000000000000..b70f4f07791b
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="http://gofreerange.com/mocha/docs/"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 24c0a578283d..38a094deeaa3 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST msgpack-1.2.2.gem 78848 BLAKE2B b3ae75ebd6159a78c6a31ecc45bfe0474d5fe91672b6c9dfe96a561b07ebb5bc9ebf91477bc370fba199c5a8c187faa4995a90aa0209b8af81e6d06cd2e58b7b SHA512 7f7fa3350485c3888a42a78fc53f91029208bc6ee483b4c1a082dfa515d435295b6d2f57e9c4cc3f7805349e4a21854585997075d2535c0343af4ae1ec66a802
 DIST msgpack-1.2.4.gem 78848 BLAKE2B 5e4c0f75e051bd1da800257600a44a712a18430b77b1c6ceebf1b6452bda0169fa7fdbd3dc5230b76da226965b32e1581ab3c27be8416c00bd90e827b22bce51 SHA512 dc2267a8c2f673ce6c8910e09841ec01bd84f06baf68b9c9ba2c0acb905d197ca82f481748ceb7edb7dff5359c4d983f381882923a1d935bd5bc536bd2fa60be
 EBUILD msgpack-1.2.2.ebuild 1134 BLAKE2B c96c7d377e63ae95ffd1916ba016489b38c9c34387fc5b9dd52a9730e633f3b3b661f1d8d8b21f7f66fcd962a525d8ecb28ec6af509e44a0605eba96d5231601 SHA512 2345264a73acd9e213d5dc5d62843b83e06bc6d813bd843519b1483366c0a42c3168997329d71b90304f9d2d67f53ef74196ba6525a9b9d0247a10c66820476a
-EBUILD msgpack-1.2.4.ebuild 1134 BLAKE2B c96c7d377e63ae95ffd1916ba016489b38c9c34387fc5b9dd52a9730e633f3b3b661f1d8d8b21f7f66fcd962a525d8ecb28ec6af509e44a0605eba96d5231601 SHA512 2345264a73acd9e213d5dc5d62843b83e06bc6d813bd843519b1483366c0a42c3168997329d71b90304f9d2d67f53ef74196ba6525a9b9d0247a10c66820476a
+EBUILD msgpack-1.2.4.ebuild 1101 BLAKE2B 0582ac0dea935e463e500f1a164a40e185df13360197aafd89b374c08adfde0c84854fbfb543bbd870d4cfe5b80a55e1069f271dab42024721cb9f3fd5e5772b SHA512 fae3728d285f338c8b00d6f4765ccfca17c8bcbe298352ebe05b2b1115fb1cd5eac15d0d51140d81e29c6d20a59e8ba14f8454cd45fbbdae5d8f8c9d287effc7
 MISC metadata.xml 331 BLAKE2B c964da6cce4e1e413377a6bf37282aa6ba207c33f3682ca5738361bb0df8c45dec063abe22f3183354b79b70707f897382a3412de1f6b185460a26ac2006f082 SHA512 5cff44a3b9425bbdccb3b682a26355c9526931b2826d7ff91da0d6db5e0dd139ae556a47dd06757b5cd209413b67181483189ba2dae819f70ffa58a46751c4c0
diff --git a/dev-ruby/msgpack/msgpack-1.2.4.ebuild b/dev-ruby/msgpack/msgpack-1.2.4.ebuild
index ea2b33ee6acc..280a20307332 100644
--- a/dev-ruby/msgpack/msgpack-1.2.4.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.2.4.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
-RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
@@ -19,8 +19,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc"
 
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
 
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
index b2c534027d66..bcf2781de066 100644
--- a/dev-ruby/rbnacl/Manifest
+++ b/dev-ruby/rbnacl/Manifest
@@ -1,5 +1,8 @@
+AUX rbnacl-buffer-size.patch 765 BLAKE2B 0865380f35748adeddda7a9a880df0c1be81994a965ecd40505e9f47f39c7d2a55876080007e28204e388f5a09396d28275d2cf9547536523c7d2fc5f6e035d1 SHA512 da9dd16452b1449f3d862d940b518bf4b99726195ee0ccd0bf3633299b6d9f44120b9b638b77243f7a1c30802d79e6467d2673eb7987cbe38091033aecda283b
 DIST rbnacl-4.0.2.gem 220160 BLAKE2B a4a3a7b0346bdc3d0e1930bf9b1c6c05182456837c53c8a56f5d8eec831df8768589affb00450088c4ccc3de37f474a359e9ea362655ea66ada63467936abcbe SHA512 d13d36e4248d5e40bb5d9496e08823438d312c16d14e3068be89a62dd7f80ec7f99fa5995752b183656b6ae863af77645b16ce45d05a74ad0dfbd4a93c8854d4
 DIST rbnacl-5.0.0.gem 221184 BLAKE2B f64a754c478c57af901432e9cef335d9f01c1acadcd9d860dacca2ed5d59bdb71f3a431488357b57cbe7af61cf03b50b95ab5421a9ac59f63242a0ddd693e373 SHA512 d6c0c90587beae9f5086c442f4b7b9f430d527576307c5a5cdc5532b231245e5615434a001b3a4b47d1fb7d7148a167d77f12e7b4f5bd1c25c7ce5d361eb42f6
+EBUILD rbnacl-4.0.2-r1.ebuild 791 BLAKE2B 408e3052ae835f5ed38dfd2868d0f487f8a7d98216c13e4653442486876970f85dc6cc44412bcc9bc8e81485f2328b5f20fcdbe4db476263f566195b3d52001f SHA512 c8fae88125432aec1ce993d5d2b4c190bbc8367bea58967c460b52811ce061485f3646e3ad66c7796051626d19a56960d13c166232e679fec9f9e6c78fbcde1f
 EBUILD rbnacl-4.0.2.ebuild 732 BLAKE2B 5be15765f01815876ff917d7269dff676b976bb9df480d023efaa33fb2ccc46c5e1c48b50779728dd5138700745591b513c10dbaaff215efe09f153e87b3d31a SHA512 e79034cd960e14e132af7dd970d84a9c7fa33d91a9ed158a4efab3abeb370658535ebb32346b7126dd0422bdfd45cf5116b38ad333810596c47c216237a331b4
+EBUILD rbnacl-5.0.0-r1.ebuild 791 BLAKE2B f9e541f536b12d9100c62cf354a494f2f2975104fdf538a0e185cbd2f4816f238daaf8f15c66e1bfb4d46c6ae5c28644ec09121843da557cb5996315f69ff163 SHA512 a0a0f2e4696e68406d29420c2032e2b957d106b76b093da801d264ca075df17ce7fe94d81c8e0e2809992974138d3737bc4397c1745aa8a0e7f8f17b861861f2
 EBUILD rbnacl-5.0.0.ebuild 732 BLAKE2B 28181a8ec26112bb8eb2e24c4d63c31ddbaeb8fe869c759462c92657547bc6129834f06264dc728749ec18a99175535fecf8b06610fc6c1fea478a0758e32f83 SHA512 0a2b2e61faf92b904efb535b7641c0db37caa78c21ad71895cb864b505dacc53df4186ed35b7ec241db754b40af83a0285a65676319339c8077debcf51c202ae
 MISC metadata.xml 345 BLAKE2B 9b2e901225c95717838370d1de17dea5619d4485d7856050d55abd8bd05eeadbf012ce47b160d367e0027d2e42abfdf4eed15c598d0a8062713a00894495cd88 SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e
diff --git a/dev-ruby/rbnacl/files/rbnacl-buffer-size.patch b/dev-ruby/rbnacl/files/rbnacl-buffer-size.patch
new file mode 100644
index 000000000000..3725c8550e0b
--- /dev/null
+++ b/dev-ruby/rbnacl/files/rbnacl-buffer-size.patch
@@ -0,0 +1,24 @@
+Patches based on upstream patch below but reworked to apply to 5.0.0
+
+From 299e0ddbb8fcafc99214c26d6002da145cc84a0c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 18 Mar 2018 21:13:09 +0000
+Subject: [PATCH] rbnacl: fix byffer size type in randombytes_buf binding
+
+---
+ lib/rbnacl/random.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/rbnacl/random.rb b/lib/rbnacl/random.rb
+index 9742186..db85d6d 100644
+--- a/lib/rbnacl/random.rb
++++ b/lib/rbnacl/random.rb
+@@ -13,7 +13,7 @@ module Random
+ 
+     sodium_function :c_random_bytes,
+                     :randombytes_buf,
+-                    [:pointer, :ulong_long]
++                    %i[pointer size_t]
+ 
+     # Returns a string of random bytes
+     #
diff --git a/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild b/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..8501b10c9e7f
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-4.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/cryptosphere/rbnacl"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+PATCHES=( "${FILESDIR}/rbnacl-buffer-size.patch" )
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild b/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..6637069d73d2
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-5.0.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/cryptosphere/rbnacl"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+ruby_add_rdepend "dev-ruby/ffi"
+
+PATCHES=( "${FILESDIR}/rbnacl-buffer-size.patch" )
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index bc0a8016d0be..0485858eaeff 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,3 +1,5 @@
 DIST roadie-3.2.2.tar.gz 45511 BLAKE2B 3dba057930f330a1c35c6df6b0bdd341b78dfd548e492e2e831847fe6475c4d108a15c2d3077c26b60e8b2b72b9c68d88cc2fd3394ac3a09e0d411cfd58d7888 SHA512 484133fccdb6485c00265f62c0ccd88819eb12acc6fe10233740c8b7d1418511d5b7d1cc67f222a5484205bfd7e8616c614136205e75cf85875296b37ecd603e
+DIST roadie-3.3.0.tar.gz 48893 BLAKE2B a06d0515f3019940e0fe1284feebfeefe3db7f66b906e5c146c4407cc8078400645401050252bd4830aecb478d3d1854c41e4c9a82f0a966efaa8589f8d9a933 SHA512 bd54186678497812793fba6de13099dd166d15e2900cf6013d16cc4654a6a7b5392f50024f5d4964d9481f31f0b5272a1de7831028fbe9e9200cb54d5f8f6bff
 EBUILD roadie-3.2.2.ebuild 931 BLAKE2B 1a65f743830b35ff2746d75c3bc7494241372399ab25c329c5ad76f52493e98283b016684dccf90af185c262b873c010c920613842d14b8b703ba0ebd9897f02 SHA512 dfcce45cc2eea219c48807028faf99d241cfd050f1fe064e418f9c89097e71fe2982341325313e5713244af29a581793ac8734f1bb86f75d3b7dcd25932250d9
+EBUILD roadie-3.3.0.ebuild 931 BLAKE2B 1a65f743830b35ff2746d75c3bc7494241372399ab25c329c5ad76f52493e98283b016684dccf90af185c262b873c010c920613842d14b8b703ba0ebd9897f02 SHA512 dfcce45cc2eea219c48807028faf99d241cfd050f1fe064e418f9c89097e71fe2982341325313e5713244af29a581793ac8734f1bb86f75d3b7dcd25932250d9
 MISC metadata.xml 328 BLAKE2B 1259d1fa19fc2a8d67f47d7ab4a409758d735839a384b75fb9807a1350e1dff6caa79e19063dd0955616b15a12f25040db50d2ffcfc4fdf038375032ba9b8a4e SHA512 56c3c637b8500939fa5b0c54fcb7382a666bd3d661baae8074dc1a11281aa149ed6911d19831ec62c311917bef30d10498c9c4323866cec6c0f9f267a5608ae2
diff --git a/dev-ruby/roadie/roadie-3.3.0.ebuild b/dev-ruby/roadie/roadie-3.3.0.ebuild
new file mode 100644
index 000000000000..b9901f6690a6
--- /dev/null
+++ b/dev-ruby/roadie/roadie-3.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find . -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 180f2463277a..0a6260c49315 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -3,5 +3,5 @@ DIST tzinfo-1.2.4.gem 152576 BLAKE2B c6815fc7277153c5e00ea2359845df25affab5a08f9
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
 EBUILD tzinfo-0.3.53.ebuild 1037 BLAKE2B cc022bdfb10d40fd36342a251b1923841a0afcc075d8cac4171cf3993f1dcd48c22a2096beb2a508a51bd9308ea6d48333e1d801b560a6f5564f01a235f9b572 SHA512 47af77517243d7cbb6aabb5e7ae1ecddc56dc3c5e02c82895c602ea6dae0ae4ad8838830e870c6a171b2ae32eeb4acb950b8470b9138614f2898362c764c6d15
 EBUILD tzinfo-1.2.4.ebuild 910 BLAKE2B c45b5f955e9498760ec05f6663fd32216750e4e618a2fb5edf6a79dd869148a354bf6e51fb7c7efc39839ff93cf04e5c989c226ad9dd1af3002c7379aa1c0f4e SHA512 8967d89d0963a89652ca30b35342c2a5a9f16a2ff17ba604e16163572ed22a8de5b8eb7bcaf7483fd3257321225e3bd1fa18a71a8d1963263c48aedf72baca32
-EBUILD tzinfo-1.2.5.ebuild 912 BLAKE2B bd7b1f86201a121ff9050e52eb3cad7a11ad58c6ceb1a3ed7b2e947b596652ab9ad8bf041bd67c4d8a86c5dfb4fcd1b5a172a9a314bd4371bfa20b1255cca68d SHA512 6425f8ff4aba10bed2abfea25b45f05c3f34cd06e191a606a548da0330c5e21c50468c6f139dbaf3ca2bd52d20a2a02a8aeb7d7f1c3ea50e182601ac1d48c690
+EBUILD tzinfo-1.2.5.ebuild 919 BLAKE2B 7467074806aefab30b16f6adf11a4f88baa34f1fede9af1d3f9111b7eb518f473c866976a63a98e871a7355feb963ec4b781d5643c58ff0e3d3d9aae42e4baa8 SHA512 8c1a91ea92bb1451d99fdf4978069acc0f688f7e4e55f13811cd2896972063298bf42139cea70ff3174ce572f69e4404dc708bdcf7ae14792228940be8583204
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
index 4a90162b8bc0..d0d98be91102 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
 
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 065b6b99a0e4..e508c1bb0b1d 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,5 +1,5 @@
 DIST yajl-ruby-1.3.0.gem 550912 BLAKE2B 1fe5fd43809fec2bf06d8db14cb6cc6ac5fe59dea8afc12d4c8ca6d0ba7c1095f307575c86cdd6954ce0b5756de3fc2232fbd60398bdf1902da005c6d8242031 SHA512 351e46fb7037541096172bac5c3dcadaa6ac9650ac6aae46de2b4ba31b82427f596bade2b233d0d8e916927800e83b7930b5ceeb9d7340edd02c323f9c0b3116
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
 EBUILD yajl-ruby-1.3.0.ebuild 1231 BLAKE2B 29060bac0d2f196a06fd38d0010e826b6dea1d2a9c32e11aecb115a314de02c411d9d30889cdd2a8666a2302bfb4ae79cacbc86b9310b9196b0b32aadaeab685 SHA512 c8c2c76ec2c322ab5126822cc75c50cb2005ebc3b1af0bc6ffc5ea9daa83b9a6e07ff40ab4d1f90c1f6cdd6d56d9aae563c05c00b7a3fe6801e8eff3a75c0c3d
-EBUILD yajl-ruby-1.3.1.ebuild 1239 BLAKE2B 73ac727e72bbbe17d3131c37794c1cabd0330417b96b616432b8b9e7364c15bfd402d2d9db93511771719ceb30db9cbea64164b5b395b828a5349df219329386 SHA512 ae4041c9c58da6853b328c60607442c28bf47cfd425cdf9040abf7077afed7b9bf84f217eccf9dda56f52c630299cae741712d15a865be040fa152255f085ccc
+EBUILD yajl-ruby-1.3.1.ebuild 1243 BLAKE2B 2142bbe5ff241f6c5ee8596727c7e19f3e6d31af80d8f11223bb9e3154b1f900b66ed67028a130fb0ddff3f44dcaf5cf7aa98ad400406e04a75b74fec9418b48 SHA512 e9a830d0c37eefe193e41c9cd687e993a657066dede7b506f2196a45a5a3f057a4c03654032f8bc8c0a5f67250f4e6095d1082d69492e58dda7a7334e4310f9e
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
index b8ecc24eded6..adf0f437769d 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index e92ec5bb5a09..85e0885c1b89 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-cairo/Manifest b/dev-scheme/guile-cairo/Manifest
index fea74d41728e..d0c8a1dee8cf 100644
--- a/dev-scheme/guile-cairo/Manifest
+++ b/dev-scheme/guile-cairo/Manifest
@@ -1,5 +1,5 @@
 DIST guile-cairo-1.4.0.tar.gz 512208 BLAKE2B e0e5a4eaca54aa2579f0fe7727dea5de48cf11243e04f6fdb692e715932470ac74b2cc24a30b9065edd4e2bcae39b25edc553eed3e79b334416f3227f0fb9bac SHA512 59e70c9a78b50bc8f580984cf67d9708b9a201920736be16d3ee2b8e73abaeac1c2b9d934b1713529043474881cd7258cb8df99ac317f6a10417b08a677c0759
 DIST guile-cairo-1.9.91.tar.gz 578928 BLAKE2B e0b766e1a83ca8d630760b8bdfab0bb0f26cd58bc6e73198f197ae7de7fd53e5a377b64f8b06f69a037caf566d94ce172e6f62a5b0114eedf859ddb6eb9d8021 SHA512 bdade3463bdac2f29519ef3001286e07ca3c57615183f2e5ac121d273f49c4dafaf3125ef7f8630e0695c0d73368c98241c59acdb9c5682be42bddbc4b5a28ac
 EBUILD guile-cairo-1.4.0.ebuild 637 BLAKE2B 488e5becd66ffac0ad03a3bdf5e70014dfee6047e2528c9f6128d4303ce8d565a470a46ba51e9ad0da49bcff15a8a059ec6b095dd4727ff031fd61f2b88ad5fd SHA512 85635c75f52f3bb2b055bb085c1136a754777d58016f4a8716f3763c8d7e5486c03bed4a6e8fffa72d44bceef7c85a24be91b528dda2178310bd38302d8dbd3f
-EBUILD guile-cairo-1.9.91.ebuild 634 BLAKE2B 81a6b760903af49f1c442c45e0a6b7e14902fda332e59854b2867257d8c7802a0ab31cfa5509fb905082d4ab7adad33b0b0f054b165dad54c8ed1b51fc95b7fc SHA512 03d6fdd3e2075d431f7a35abbfbae05019d2d7d3b9c684c23642dbe6968c728095cb60611e39bba053ff7305d4a6f0f313ad13eb1ba4f88dff372fc571130033
+EBUILD guile-cairo-1.9.91.ebuild 633 BLAKE2B 51e2a6c49df09f4f99f3db234208842a689004c28ac6804a1adeef24c2ad5be4412c7ffc646d0775e638203946ad164f7c5756c059727b1b08b7684a7973629f SHA512 6de05e90bdc352e598c99930a1f3c70c19da752da4144a30c551fe35bcb4a057dad2f6d25f0e17d622362d161670ed082c970d4b5dce7daf6b17c2683bc12fef
 MISC metadata.xml 656 BLAKE2B 6c5e7e33fcbb53fecd80e13d4e66c0a5fa3126ec3a590dd5136490bad12ec64c722701b2ae2ef700a192d3b8135e77b0c8457f531b677a80fd7d1d66f17e3f7e SHA512 25b8b5f5b1ba90a7438c1dafbfe3a9a8ec9e2cea847f7722e33416a96bbc3dd5531d5e2607a803496aa3b71505b8a728e2d30e841e399ed30361853a54917267
diff --git a/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild b/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
index 623f2211d134..3c05bf32c2d5 100644
--- a/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
+++ b/dev-scheme/guile-cairo/guile-cairo-1.9.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/dev-scheme/guile-gnome-platform/Manifest b/dev-scheme/guile-gnome-platform/Manifest
index 4e1970281e53..9e5c65044b7e 100644
--- a/dev-scheme/guile-gnome-platform/Manifest
+++ b/dev-scheme/guile-gnome-platform/Manifest
@@ -4,6 +4,6 @@ AUX 2.16.1-gdk-color.patch 2328 BLAKE2B bbe5837601ac13097832a5488737eaf159ce4bbe
 AUX 2.16.1-glib-single-include.patch 944 BLAKE2B 251be62ed49d67a234b5ca321c19febffd54ac3b4b4dfb84a42d84771cc4b17bc33adb19daacb4ac7ba6ea6afef69cb69e62c5f1e15e2911fce6970287dbec9c SHA512 f50eb52f0150a365f79314f1756c6ae78018a18ecbb488e830c27d4e76c3da6ad2bf46c7d44a35d3172c57bf709f5d4614ffba7652a5b459b542a0994ca47dea
 DIST guile-gnome-platform-2.16.1.tar.gz 3494333 BLAKE2B edd5c91a263c9a6bedb884d842f629c7d4fa610f5a4ba277ca374279a5abbcf5c1fb9ff85f7bb5faaed8905ed0eaf711bd469d86062d293930ca885b1aadc271 SHA512 c630e2d67b312fb41c8492f8956902f385faa834094860cac580d1df0329b41790d973f73fd7dd59dc365f5d6cfb6463cde8af90641fbc377680b51616ad8f7a
 DIST guile-gnome-platform-2.16.2.tar.gz 2538191 BLAKE2B e16d3d667996c822401a4e3982728db91dda1f02be5739b7dd0795466f0976f3fbb2692a21918f2f6c2502faf5c90bb0d287de171d80cece41353cccb2715488 SHA512 5acaa96d8caf82864ada8bfcbc4954a19cd5d7e210245f2e8b31082c6a9e4ab9ba7af5f8e1f762a891e1aad640913a7a205f56dfaed6915a9f782c53e042d042
-EBUILD guile-gnome-platform-2.16.1-r1.ebuild 1453 BLAKE2B 0594cd1aed4bc36396b21259f123bed9c9e94dcfdab37f32ef2ff7555c4e8acd622d6cf03d882e4e18db56f9aaf41b7eef3269f5cd0ce3932ec1193247c9c31e SHA512 d4162867eaf638391a65e0bae4d3fe6745d05d49d7b6cb416360d3ad21cac79765b8db4d8fd81a5f91931363802d79277cd80521740b6d40b248194bd0c74081
-EBUILD guile-gnome-platform-2.16.2.ebuild 1239 BLAKE2B 8c8845e8389a08d8381c8557670a745cd250c7d68b7714640abd48364b6e1adbe72388bace29d9d8768afb8073a7bcc1463b0bc431f54a06fd860f284ebca411 SHA512 1c8ad74c37b93b10266ed232606cc3ca04b470d6d47655e8bb0ec5e7c7044a0e843dcc85b59176fb5322eb4abcf83979dbbb57fc9e4422377143b5d2f77b56a3
+EBUILD guile-gnome-platform-2.16.1-r1.ebuild 1448 BLAKE2B 51b2633a873f7eaa7797459ddbab32eda473325af35ef00ea26d01cca555a437b0a40ce0d69730dd77814eba48f4e43fe536414922b190263325e4541522cc68 SHA512 4ea5b6c916e2b7fc334e9352fa58f655052663e357222a536b20aff7536482d3386c34a844f68a828117a1adead8d751aa0dae32f11c2a01b26e126a8cb2906f
+EBUILD guile-gnome-platform-2.16.2.ebuild 1235 BLAKE2B dc6a0e0c086c4954adc50928b7d230eb9db0dd52e14bce7de6553a56a0ac6eac44b9285ab4340c95bce3c5e5d3101d0868546edb84757cb80398334eb06755c5 SHA512 16b515053e940e574e2695a25ad089efaead772b3589a8d7c5d12e056bf568541539b57eef958cb704c20d710d941a38d33f6cc91d8c18aafbddbeb3e30d4161
 MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
index 0155310f4dad..cb8d91a9a8d5 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
index 1ddcb0e7b356..ee22dd2fc05c 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://ftp.gnu.org/pub/gnu/guile-gnome/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-scheme/guile-gui/Manifest b/dev-scheme/guile-gui/Manifest
index 2a3a17771d0b..196d0ab65eb8 100644
--- a/dev-scheme/guile-gui/Manifest
+++ b/dev-scheme/guile-gui/Manifest
@@ -1,3 +1,3 @@
 DIST guile-gui-0.2.tar.gz 33885 BLAKE2B 85fc868f7fede45947d4e4fdaa757f2de08e4da2d63e34a46917fee367df4140dbc05cf230f2f7ee73fb5aad52caa53c1304d167d21d0186a042647cb6cea57b SHA512 98d6eaad412232c45e363b8e85ae74bd36fd7f89c2af3932c17eba04e2a4c70ddd8bbe86488e1277534c88e331d8c4ef3fc89f3b0b6b2a35b48d09a23c8c2d89
-EBUILD guile-gui-0.2-r1.ebuild 456 BLAKE2B 14bbb7a2cb9fa7d1fe8e76c1dad7384c1cc53769393cb48a81b2050ae69f1d0a95bac92a19f555d341373f6279968829ae6b90b54ba403c3b6ea279c59fd3043 SHA512 6af63f4ba7b4a226236a02b668bf674f890c372507ac0327a6c0ea72bc11903778a3845dd8113988b217774ae4d796eccbe68c31453596c102706808a5fb37b7
+EBUILD guile-gui-0.2-r1.ebuild 451 BLAKE2B 0889f875e5bda5bd462982dda18ba187cedd31eb75d24c2e1235468b1b148f312b8d9dfc31c73605a2b3c21ff9639622df55c0da8f522ec84e8b577a163db67e SHA512 525c0383962378b984df5293a2fc004910d9a85e042880a2bee18676489504a5df9da0b23451c22903a0e3c12b177d0c25fc0f45d21a72bc8fe6513cbd4a24bd
 MISC metadata.xml 261 BLAKE2B 509ce9958149f9cd522a2c68dd0d23ed851d19d02494611456592897093378d180a6006cddf1575fd60106119e72726255c49db2e10fde1b370bdf2f3cf8c94a SHA512 72682d17ec2b918131b551bd1ff41004965d3cf0c00d24222b34741d2eabf601cf36d4266be70ba7fb7bd0ab55d9dcb5b8e4ca41125bc31f176516797459c8c7
diff --git a/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild b/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
index f615f3d831fe..16f86466ad0b 100644
--- a/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
+++ b/dev-scheme/guile-gui/guile-gui-0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.ossau.uklinux.net/guile/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-scheme/guile
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index affd68ee3ceb..d29df282374b 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index c50d2c0f02a4..6e595029a1e6 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -1,5 +1,5 @@
 DIST cjk-4.8.4-doc.tar.gz 2152418 BLAKE2B 09b72aa75efa01ea880a99bf0c289dd3f7d0c107080b38fb99390a39c1179884eb55fcd32f978f07fdad25898aabbc636367e3ab83d1f1c1ce95aedfeb46efb7 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877
 DIST cjk-4.8.4-fonts.zip 20384230 BLAKE2B 6b73b20381b6a1de91cc7de6760f9c453616857b5fe493e90944145ae16c42b85f760018f2b2a6397fd8f1b02801b58b6e35f2a5493fcf0b367be2d25463664d SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1
 DIST cjk-4.8.4.tar.gz 556197 BLAKE2B c884d8482dc107344c6afd3d2eba49c84907fdeaa9bd422c1239f2c43ed643991ad7c16c3c2a6dbf7d7bb0642c8f41d707feb98a5d08fc32c40de69615eb08bc SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3
-EBUILD cjk-latex-4.8.4.ebuild 3642 BLAKE2B 15620832386c412969f141d95e7d7052d468728f63eebaffa10be267bd6a810b8421ca29d50e720427ce8e1de418088824cff463b8dbb83d173c8f722f58bfe4 SHA512 9baa44839a60defe84d6144df84acbd8431d6d96882f36857dbe5f3d557aba115b82485a6bd535912a8fb62cb59835268e76987851e3490c1d5122e44f44f0eb
+EBUILD cjk-latex-4.8.4.ebuild 3653 BLAKE2B c01df2a44ff0e7c8923512682ad1948d380ab7123b85c52233d74527d8b0155a262b01ba592cad7ac700d9b95a8c941a153e0916abfb858a60c37d5f3907982e SHA512 7b8f82287d9973a2187f3b784739112ee9c89804e61d92f9a90ec658dbf11643a09193e1f78116bf539b0fab4dc976e9c26afc6a881f46a862a9b6ac2aad49b3
 MISC metadata.xml 336 BLAKE2B 3b1a7634ed8211dbf66256972325fc0227c3d03f43d9281b035909a73fd3278f5569156430c501c10545f1f8879068c533529293628bb4fe043d77256af4dfb7 SHA512 02b448b851022e1aa1e70f9b7a5e21bf0d7d8638de6e8064a98dc2f7be856af7dbaa1ab527f5fd940083e0866748819ebc0c49dde4945a383958256b02aeaefb
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
index faa040aa6d08..7689d080cf86 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc emacs"
 
 RDEPEND="virtual/latex-base
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 976e7d52c89a..d6b9071c7fe8 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -3,5 +3,5 @@ DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11
 DIST tex4ht-texlive-2015-08-03.tar.xz 801488 BLAKE2B 56397450cc600141cbc541188e4a896727af4823982aae20a198d27b51fcb071794a1aa5a4037cf803f9b172c3183a927b7f446757df1520a596b5b6ee150a06 SHA512 a8a56e0d41406df8c76d72eea6f726f012d70a46665d9dfe99c7362790a2f0126f2c21e07c5de08aff7694e9837c47e162aa6790c256b4538f4780551f6e6191
 DIST tex4ht-texlive-2017-02-05.tar.xz 826816 BLAKE2B 8387c1fc7326cb4eb74ec82d15ed6a6f07bacd08788b00e3e6583bf993e0d0e0d387269650217a2a2f2e1f4b94cc8e154359d258bf3311820772b5fdc9aeec34 SHA512 c5a62a10b956d1108f288490e966e9c225555a74ace7744058a4464e4b166f3906d429ed8557d640ca0e9b4dbcc4278ef20298e869560a906c85c68ff832be52
 EBUILD tex4ht-20090611_p1038-r4.ebuild 3645 BLAKE2B 5244b6f59a2e74fe1d0b2629d836bbe17d4b7177b4774f0c7de9d649cc42ed1bc83e6af319c9e9a018fe6bbcf364267328c7a2805e5c17af91b26bc8165343ba SHA512 29252db9bd919f743f325a54f1efb72513fb07b040dcd963e2b566d5c5f9b470624a72e11c4cb47908d893df0c55118af06d5f2e426d5ef1388fd5bd57468569
-EBUILD tex4ht-20090611_p1038-r5.ebuild 3656 BLAKE2B a9968255bff6095a498b1e115655cd9629c2b836c4f19d6205313f3b670844b78e6739f8dee3fa251c9fdbfe2d12dd6a30f638a9c1cf5d02d00181d9b66aaf6f SHA512 ac428a600601db79f62dad93481087e2cac8f3e5ac36973993d1fa7d38bebea919c6087a79e35addc1937d309aa5d187128838373f2ab23073c4e26787b41977
+EBUILD tex4ht-20090611_p1038-r5.ebuild 3667 BLAKE2B 21c903fd2ccd19fcf9adebbc5fd7afc4994327ac219003ee563329a9cc5d4a895223e37b6e0bff95bb184888737a94f3086851f96b0713157628cbc43ecdf5a6 SHA512 c136cd88318233aa1c94e81626169a19e647eb34668ca27c1372255efbfb7e6f75f43969a6c3ce15661e660de76641b35e02d3a2f74bc13a99e83b2b2999ac56
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
index 43edb10d9fc9..6e0a32cdfd11 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
 
 LICENSE="LPPL-1.2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 SLOT="0"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7de77bb4fa03..59d37af00aa2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index ca5e7baef2c4..d54be0032abd 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,5 @@
 DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
+DIST android-studio-ide-173.4670197-linux.zip 894043298 BLAKE2B fe8f5175a4a6fa66bffc351e0af3ab5241f0876ba531d6db6cfee28deab1cf00e9a162f4089d87be2e582c4e77908e428fc707e42166688da80d86901548c57c SHA512 2b5b2e84c980036a82a345e57a8ee4ae670db6c3f20e13c4a6fe5860aa74d4a8ac6b9902742455be43c78347dde71c087cbdb21a497bd0b13c6b1a15f9bc135b
 EBUILD android-studio-3.0.1.0.171.4443003.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
+EBUILD android-studio-3.1.0.16.173.4670197.ebuild 3074 BLAKE2B e8eaa428420dddd0e0fcd5ace1dcd0eaf64b6ee8011d2ca961e8ee166d0e1f7ace254c3b28208b1b19558910842d9c9876e8a56fc2781aacb5c15e61a4fb6356 SHA512 1c6ffdf4f63b5701ba2633ba3c58dace43f5921695c9bd3165fb0a6343ca024dad2655ec328237e22e988d45488d57256c47bcac73fa02e1604329d9bbdc50aa
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.0.16.173.4670197.ebuild b/dev-util/android-studio/android-studio-3.1.0.16.173.4670197.ebuild
new file mode 100644
index 000000000000..10d45b8040b7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.1.0.16.173.4670197.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 versionator
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+if [[ $(get_version_component_count) -eq 6 ]]; then
+	STUDIO_V=$(get_version_component_range 1-4)
+	BUILD_V=$(get_version_component_range 5-6)
+else
+	STUDIO_V=$(get_version_component_range 1-3)
+	BUILD_V=$(get_version_component_range 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	doins -r *
+
+	rm -rf "${D}${dir}/jre" || die
+	dosym "/etc/java-config-2/current-system-vm" "${dir}/jre"
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/clinfo/Manifest b/dev-util/clinfo/Manifest
index 583fd35f5897..7f775b0d56ed 100644
--- a/dev-util/clinfo/Manifest
+++ b/dev-util/clinfo/Manifest
@@ -1,4 +1,6 @@
 DIST clinfo-2.2.18.03.26.tar.gz 38519 BLAKE2B 736036f4f84c170876b9b550bfe837c67a273cef9032af8734035edf5070d17d876d10f7d5c81889966df0a9ad4192c43c1501326188782cc674611ea57130ef SHA512 dec90a314e6c52e5501339dbe594cb57cfc8cae6855db7bb88b36984fd661e55f2cc8eb29fa546998862c806ec752bfc2b6a9e0d9d962370f84b0091605c1bcb
+DIST clinfo-2.2.18.04.06.tar.gz 41459 BLAKE2B e90a515fd9318aeced510cd97cc477e1925b37e2c389ffee0ec484563acc9f0f9a8880cb38575b299c4f63e1b4a6959064d7d0d45487f67d6fcf32ce91962a47 SHA512 4aa1623bd08602e2104b4ba3150f36a9e8e8fb25728d4a1792a9cc81a2a5952a4a78ccad0928f098ce4e8bc05f30d09267e01ccd81d541fdfb0bc7de46908faf
 EBUILD clinfo-2.2.18.03.26.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
+EBUILD clinfo-2.2.18.04.06.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
 EBUILD clinfo-9999.ebuild 654 BLAKE2B da695fb68881c2aa886f68376585ba2f499bb8ed90535da7ea007d9b9d922fdb160126f2044f81ef305e32fe1032118e8b15d70d7a416a4cabd4eb298565e2b7 SHA512 80847d385832577b91cc16559e3c7bc37b87386273bc2179f43aa335fafa1fd1d0d312b27f5193b55274307b34cb94e08b2392479ae9b97fcbfffacf05398ff7
 MISC metadata.xml 327 BLAKE2B 92f019eb0500214ac6f345ee38aeb8df84ebf69a503fcb9dc3284e23d9badc20fbd985aa9f60df6b4d9f515027a4e973b2439c568b0a63f5acac2be97de04dfc SHA512 20261dabbadf6a93f4b4a7d65c917872de7b81f689e111a3ea0076a066201eba82b2061cf5ae9956c00f5d6208bd4dcc922c72a3feb2643aedfa2dc998c0bf21
diff --git a/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild b/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild
new file mode 100644
index 000000000000..3d01e885bdad
--- /dev/null
+++ b/dev-util/clinfo/clinfo-2.2.18.04.06.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Oblomov/clinfo.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Oblomov/clinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool to display info about the system's OpenCL capabilities"
+HOMEPAGE="https://github.com/Oblomov/clinfo"
+LICENSE="CC0-1.0"
+SLOT="0"
+
+DEPEND=">=app-eselect/eselect-opencl-1.1.0-r4
+	virtual/opencl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	emake MANDIR="${ED}"/usr/share/man PREFIX="${ED}"/usr install
+}
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 896a4c633266..fe320de05228 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
 DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e1982f4afa00fe23da4e63d55d648e8767443c2f6c18bb2639defbe79034e709dbfd5865bdff0e11f090320132de9724994b9a SHA512 7035d3d6b9bba0f56ca15580956bbb69c3449ca75c825563217ea5773984a976e455866a0046f045573c5fcf8398887e19a87f425299a3231a077a158ccf2f97
+DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
 DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
 EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
+EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
new file mode 100644
index 000000000000..832428b34fa9
--- /dev/null
+++ b/dev-util/cucumber-expressions/cucumber-expressions-5.0.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="5.0"
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index c6f8a66f8fab..5ec6b3803f26 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,8 +1,5 @@
-DIST include-what-you-use-3.9.src.tar.gz 446773 BLAKE2B 6b8e66e7ace440ff793c07fb3a4c3db95418f213c629b119fff315559bb581a04b864f5a8cf2eed2221dca84af23fb7ae0c3b3a2c4a59af88bf1e656951f5e8e SHA512 dd7990fa4112ddb0434807efd9dcf0f77bbecaa61eab51be24428f8e45b9321c7647a979278f3f1266ba9be05c6f1de536fc084613d38638b795248001ce4b44
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
 DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
-EBUILD include-what-you-use-3.9.ebuild 973 BLAKE2B 61940f05ffd32b4012be4d1710d69adfbfa5147151fd328be078d5663d73abf19ab3bec49ecf30d4a9a7ec91712162f30ecb53d796a38ef433282c8cb928aeb9 SHA512 954ea8edd222088d445c7330a6ac0069e0130729dbcb1068c889af9737cde2b31f06761216970a1cf009d39dc75b0c4f884335aeff0a844cab556bea411b6364
 EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
-EBUILD include-what-you-use-4.0.ebuild 909 BLAKE2B ef96edb28020f98a91316a4cf7e05a385f3dddd1224e326b6d42e7fc67c4a7521973cf4dc47111e9ae15440b20b16ad046417b9af7f17d61cb7cc74d336e81c6 SHA512 e99495f5a7b6c59727920370b3fe63b031841693eae43bdf33b3130dac0b9794140952390f29aec0f52421c59a084a457e375caf1d697f5d015342febd519931
 EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild b/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild
deleted file mode 100644
index a5e130971df2..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-3.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-WEIRD_UPSTREAM_VERSION=0.7
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="http://include-what-you-use.org/downloads/${PN}-${WEIRD_UPSTREAM_VERSION}.src.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=sys-devel/llvm-${PV}*
-	=sys-devel/clang-${PV}*
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/llvm/tools/clang/tools/${PN}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0.ebuild
deleted file mode 100644
index c6aa5cf5d324..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="=sys-devel/llvm-${PV}*
-	=sys-devel/clang-${PV}*
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ea76929e24e5..f7f3d674181c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
 DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.1.ebuild 919 BLAKE2B 2e740208444aec17853970d422188c0b59d4d000e1f4b78dfb27675d0cec3d5cb1d57f4c609cec09b5faab40af47dc315273380dc423fb4e16328f8b4d78fe16 SHA512 ae6275c59d93afc0c5dc36705c4b8d7e5115ce010840471e8fd1e7b31cd3c1c54129a99c24bef3034a83f0ebaa63ea0bbc526ff1fa36b14f8f1672ccb1216b64
+EBUILD meson-0.45.1.ebuild 930 BLAKE2B 154e8d5e22c8373beaa69f3de30211b1b7ddf7ab903bcad89c109b906d8e871b299c64986601810a9e1a439ea64052b9bda9384ff17ac8012e9dee83c1da597f SHA512 19e017ab667339e0a5d3ac8b1a58130b2b43e342bee5323abbb765bd359bf242705d7f8a799a7e0ae7c5bc22016329685fe0a7f2cca9a2a77a0857ac874d4926
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
index 9a6d59e8de20..d788579bfe88 100644
--- a/dev-util/meson/meson-0.45.1.ebuild
+++ b/dev-util/meson/meson-0.45.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 8534e6d799ee..9d023394863e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,6 @@ DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e78
 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1721 BLAKE2B e388ff7e7b63273473dd8174762dc94091e236416c28d1886159a22c2c21b4ac589ca709adac4ab169bccfe6ad25ab0d7549cb481f798ead8a80c30002ec5fe2 SHA512 5f0cf2935d9ed30e8cf61b1bef72d3576f8be49bdd3ac9d6b63296afe2247cb5338101b95062b51fcd279de451bd2ea5616d944eb66f7af9acc5f029feb638cc
+EBUILD scons-2.5.1.ebuild 1720 BLAKE2B efac84f070f69d0d4ad4c8d06e039934215d7017b9aaef3deb1a68d46d315996ffde52108f48fa52de10bd33840a830a4c06c1b2b3006e311533c8a5fe87a9bc SHA512 111810d9477c262e923535a2a12f48ca7dffcc3c647c8ff7e822f84370e5f8db405026df8dc539a37aeb35383b97d19392e74ea7b2b78fa9e15952a9d297873e
 EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 0770cb184db4..f3b600a44062 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index d893022bd64f..36a4f390e34c 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,6 +1,8 @@
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d
+DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e136cc1cba1d83091445e2a3b64588c0578f0165ffec01dda1cb1824c29dbdab05bb409232edede953f2a5e78 SHA512 624c3f27921b6df2eb8ff409a35fa9153c4571cd5f703e6cac18f024bccd5ff4acb81f88ca33f81d1046d9718dec7b2705e8940e80bb8447ec3e62a6fd5f8350
 EBUILD strace-4.20.ebuild 1960 BLAKE2B 65781937316df4e01de886b552b02834c37411a1c004de98b6e95e7dd2b6c9b11bfa27de5effc9661bbc341172d1cedae180e6488abca43c014e18949fccc3f3 SHA512 ca60303dcd6526df451f516dd519406e0c0160b92d400e1c44c1fac8e5df2874ae2dc8c9a2dc0297d6354246302e8bc7af20522d2422de2df858b3b1348da2fd
 EBUILD strace-4.21.ebuild 2109 BLAKE2B ab88781b7c02413b1c458a92bc424159e8302c2407d8d4c281ebb259e5e3ec5fa59df9c0ee6e69f6d639106b82f3af7c5f1d5282038433a8e4f401818bc10092 SHA512 5d5a2e17d23a2705e0011ab5ad1c5635f6548d81c7ff0f5592880794e711305a6af05a0f10797bbabc16d2b28edcf9326df513cc1b485fb62aad965c2fa46eb9
+EBUILD strace-4.22.ebuild 2034 BLAKE2B 36b40a99ed5d58b384d9a0429adf42d6afba2f0b463103180b55397fd3ef6f07079c8277899811a596ed9e0f6c629bde2ab263f37ced03a7d7665f49cf711123 SHA512 b43e5b531e789609c08c317485c05400e0c6ac6df7e1ef685d959b28b40eb6aa584139ebe88633b258ded0883b1c04db36b686229c5fba98dc2af39175cab75f
 EBUILD strace-9999.ebuild 2038 BLAKE2B 61c00720bd641dfb3f9fae3772c0c6313e904d07a8e635b1a5b3dfa263f0c810f237f34b87b6bba055e2876d10ddf793a4ca74aae40897a2beb4581be182623e SHA512 23e56bf7661d29d8331d51f68c732ceb2db55ff2a88927f4f9281beca96c0d30d39c3aa1e19f5509f22c3c2b40bfef6668e4cec0b95bdde53b9f9ac7fe1c3ba9
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.22.ebuild b/dev-util/strace/strace-4.22.ebuild
new file mode 100644
index 000000000000..1c7070c5d082
--- /dev/null
+++ b/dev-util/strace/strace-4.22.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://sourceforge.net/projects/strace/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind"
+
+LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		./xlat/gen.sh || die
+		./generate_mpers_am.sh || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	use static && append-ldflags -static
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	econf $(use_with unwind libunwind)
+}
+
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	use perl || rm "${ED%/}"/usr/bin/strace-graph
+	dodoc CREDITS
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f2a6923f6914..e4d123c827a7 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index e8272f618e51..b90c217817e9 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -3,10 +3,10 @@ AUX subversion-1.9.7-kf5.patch 9904 BLAKE2B 493c58c6567e2389bc9f33bb60981b22a245
 AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
-DIST subversion-1.10.0-rc1.tar.bz2 8346944 BLAKE2B 4d7594af685b74b18e8834449b33128102e49d6806881203e4e2a3a0e073d043ec2c6ee375bd70db722ebecc38b6bcc503734809ef6a0bda089bc88ed15af24c SHA512 b31bdbdc2ddd927e5ccc0ead8baebe641682eed58b7aee00bb775f0b5397a326eb25249b1138adfa92ac2724839b7a71012d77cf6be74edaaf13afd3fea76007
+DIST subversion-1.10.0-rc2.tar.bz2 8369167 BLAKE2B a93dec8779c6c14c6e8d4bce41212b0a75d45904f500b5135574bef5882ecfb9773972ea93fa1108b8e5efbcc1d3adf4840a9a5bd191e8a25113a6c6c26e7ffc SHA512 42e604f4888f801236a280a6ac6f27a5c4b158d87c81a50d235ec7915bf29ebe05cdd716b6b1f6851f326ffb8c9c4d608b06f20114e690d81eb91b6869083307
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
-EBUILD subversion-1.10.0_rc1.ebuild 15473 BLAKE2B d68c60e33126a967c5ba1d91eb0e5ca360e22cb19483eb6db7cb8e91c493139bc77ae9078c4409892d42d40114ecaa356261b5365d47cad01417cbf53d5ba846 SHA512 2dc1184923614f2d0b51273fba4ecebc3c4f02913d8b00d24910e485989a41c88e6275bb2cec52b54edffeb017be280161ab13ce89b2603330e62305fe85f8be
+EBUILD subversion-1.10.0_rc2.ebuild 15473 BLAKE2B d68c60e33126a967c5ba1d91eb0e5ca360e22cb19483eb6db7cb8e91c493139bc77ae9078c4409892d42d40114ecaa356261b5365d47cad01417cbf53d5ba846 SHA512 2dc1184923614f2d0b51273fba4ecebc3c4f02913d8b00d24910e485989a41c88e6275bb2cec52b54edffeb017be280161ab13ce89b2603330e62305fe85f8be
 EBUILD subversion-1.9.7-r1.ebuild 15816 BLAKE2B 29b2a237fe4bb7194a02be3a4926ad076e70cfaeb6240b1039aeadb71a2d6b42bb828f1a84acf623b38445772393f871795d08dc5cca73b3c911a38f747545da SHA512 5ad645eff753a18762b3daae71edd906be7e4a63e969614d4564d64a3a7ee11b78b834e88cd591bfd97ff294ecce52726c5ca21e7cf7f87be586cf0dc8ac8682
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.10.0_rc1.ebuild b/dev-vcs/subversion/subversion-1.10.0_rc2.ebuild
index 6d7267595a4f..6d7267595a4f 100644
--- a/dev-vcs/subversion/subversion-1.10.0_rc1.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.0_rc2.ebuild
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index a0e526c81d66..aedd7bf21d67 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
deleted file mode 100644
index 88d9ef89ad15..000000000000
--- a/eclass/kde4-meta.eclass
+++ /dev/null
@@ -1,631 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# @DEAD
-# Removal on 2018-03-06.
-# @ECLASS: kde4-meta.eclass
-# @MAINTAINER:
-# kde@gentoo.org
-# @BLURB: Eclass for writing "split" KDE packages.
-# @DESCRIPTION:
-# This eclass provides all necessary functions for writing split KDE ebuilds.
-#
-# You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
-# Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
-
-if [[ -z ${_KDE4_META_ECLASS} ]]; then
-_KDE4_META_ECLASS=1
-
-[[ -z ${KMNAME} ]] && die "kde4-meta.eclass inherited but KMNAME not defined - broken ebuild"
-
-inherit kde4-base
-
-KDEMETA_EXPF="pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm"
-EXPORT_FUNCTIONS ${KDEMETA_EXPF}
-
-# Add dependencies that all packages in a certain module share.
-case ${KMNAME} in
-	kdepim|kdepim-runtime)
-		case ${PN} in
-			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
-				IUSE+=" +kontact"
-				RDEPEND+=" kontact? ( $(add_kdeapps_dep kontact '' ${PV}) )"
-				;;
-		esac
-		;;
-esac
-
-DEPEND+=" ${COMMONDEPEND}"
-RDEPEND+=" ${COMMONDEPEND}"
-unset COMMONDEPEND
-
-debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
-debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
-
-# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
-case ${KDE_BUILD_TYPE} in
-	live)
-		if [[ ${KDE_SCM} == svn ]]; then
-			case ${KMNAME} in
-				extragear*|playground*)
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
-					ESVN_PROJECT="${KMNAME}${ESVN_PROJECT_SUFFIX}"
-					;;
-			esac
-		fi
-		;;
-esac
-
-# @ECLASS-VARIABLE: KMNAME
-# @DESCRIPTION:
-# Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it
-# _before_ inheriting this eclass, (unlike the other parameters), since it's
-# used to set $SRC_URI.
-
-# @ECLASS-VARIABLE: KMMODULE
-# @DESCRIPTION:
-# Specify exactly one subdirectory of $KMNAME here. Defaults to $PN.
-# The subdirectory listed here is treated exactly like items in $KMEXTRA.
-#
-# Example: The ebuild name of "kdebase/l10n" is kde-base/kdebase-l10n, because
-# just 'l10n' would be too confusing. Hence it sets KMMODULE="l10n".
-
-# @ECLASS-VARIABLE: KMNOMODULE
-# @DESCRIPTION:
-# If set to "true", $KMMODULE doesn't have to be defined.
-#
-# Example usage: If you're installing subdirectories of a package, like plugins,
-# you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and
-# set KMNOMODULE="true".
-if [[ -z ${KMMODULE} ]] && [[ ${KMNOMODULE} != true ]]; then
-	KMMODULE=${PN}
-fi
-
-# @ECLASS-VARIABLE: KMEXTRA
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted, compiled & installed.
-# $KMMODULE is always added to $KMEXTRA.
-# If KDE_HANDBOOK is 'always' or 'optional' and handbook USE-flag is set, and if this
-# directory exists, then "doc/$KMMODULE" is added to $KMEXTRA. If there's additional
-# documentation in different subdirectories, it should be added to KMEXTRA manually..
-
-# @ECLASS-VARIABLE: KMCOMPILEONLY
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted & compiled, but not installed.
-
-# TODO: better formulation may be needed
-# @ECLASS-VARIABLE: KMEXTRACTONLY
-# @DESCRIPTION:
-# All subdirectories listed here will be extracted, but neither compiled nor installed.
-# This can be used to avoid compilation in a subdirectory of a directory in $KMMODULE or $KMEXTRA
-
-# @ECLASS-VARIABLE: KMTARPARAMS
-# @DESCRIPTION:
-# Specify extra parameters to pass to tar, in kde4-meta_src_extract.
-# '-xpf -j' are passed to tar by default.
-
-# @FUNCTION: kde4-meta_pkg_setup
-# @DESCRIPTION:
-# Currently calls its equivalent in kde4-base.eclass(5) and checks the gcc version.
-# Use this one in split ebuilds.
-kde4-meta_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_setup
-}
-
-# @FUNCTION: kde4-meta_src_unpack
-# @DESCRIPTION:
-# This function unpacks the source for split ebuilds.
-# Further more is processed in kde4-meta_src_extract
-kde4-meta_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		case "${KDE_SCM}" in
-			svn)
-				S="${WORKDIR}/${P}"
-				mkdir -p "${S}"
-				ESVN_RESTRICT="export" subversion_src_unpack
-				subversion_wc_info
-				subversion_bootstrap
-				;;
-			git)
-				git-r3_src_unpack
-				;;
-		esac
-	fi
-	kde4-meta_src_extract
-}
-
-# @FUNCTION: kde4-meta_src_extract
-# @DESCRIPTION:
-# A function to extract the source for a split KDE ebuild.
-# Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and
-# KMTARPARAMS.
-kde4-meta_src_extract() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${KDE_BUILD_TYPE} = live ]]; then
-		# Export working copy to ${S}
-		einfo "Exporting parts of working copy to ${S}"
-		kde4-meta_create_extractlists
-
-		case ${KDE_SCM} in
-			svn)
-				local rsync_options subdir targetdir wc_path escm
-
-				rsync_options="--group --links --owner --perms --quiet --exclude=.svn/ --exclude=.git/"
-				wc_path="${ESVN_WC_PATH}"
-				escm="{ESVN}"
-
-				# Copy ${KMNAME} non-recursively (toplevel files)
-				rsync ${rsync_options} "${wc_path}"/* "${S}" \
-					|| die "${escm}: can't export toplevel files to '${S}'."
-				# Copy cmake directory
-				if [[ -d "${wc_path}/cmake" ]]; then
-					rsync --recursive ${rsync_options} "${wc_path}/cmake" "${S}" \
-						|| die "${escm}: can't export cmake files to '${S}'."
-				fi
-				# Copy all subdirectories
-				for subdir in $(_list_needed_subdirectories); do
-					targetdir=""
-					if [[ $subdir = doc/* && ! -e "$wc_path/$subdir" ]]; then
-						continue
-					fi
-
-					[[ ${subdir%/} = */* ]] && targetdir=${subdir%/} && targetdir=${targetdir%/*} && mkdir -p "${S}/${targetdir}"
-					rsync --recursive ${rsync_options} "${wc_path}/${subdir%/}" "${S}/${targetdir}" \
-						|| die "${escm}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'."
-				done
-				;;
-		esac
-	else
-		local abort tarball tarfile f extractlist postfix
-
-		if [[ ${PV} =~ 4.4.11 ]]; then
-			postfix="bz2"
-			KMTARPARAMS+=" --bzip2"
-		else
-			postfix="xz"
-			KMTARPARAMS+=" --xz"
-		fi
-
-		tarball="${KMNAME}-${PV}.tar.${postfix}"
-
-		# Full path to source tarball
-		tarfile="${DISTDIR}/${tarball}"
-
-		# Detect real toplevel dir from tarball name - it will be used upon extraction
-		# and in _list_needed_subdirectories
-		topdir="${tarball%.tar.*}/"
-
-		ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
-
-		kde4-meta_create_extractlists
-
-		for f in cmake/ CMakeLists.txt ConfigureChecks.cmake config.h.cmake
-		do
-			extractlist+=" ${topdir}${f}"
-		done
-		extractlist+=" $(_list_needed_subdirectories)"
-
-		pushd "${WORKDIR}" > /dev/null || die
-
-		# @ECLASS-VARIABLE: KDE4_STRICTER
-		# @DESCRIPTION:
-		# Print out all issues found executing tar / kmextract files
-		# Set on if you want to find issues in kde-base ebuild unpack sequences
-		[[ -n ${KDE4_STRICTER} ]] && echo 'tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist}'
-		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null || echo "tar extract command failed at least partially - continuing anyway"
-
-		# Default $S is based on $P; rename the extracted directory to match $S if necessary
-		if [[ ${KMNAME} != ${PN} ]]; then
-			mv ${topdir} ${P} || die "Died while moving \"${topdir}\" to \"${P}\""
-		fi
-
-		popd > /dev/null || die
-
-		eend $?
-
-		if [[ -n ${KDE4_STRICTER} ]]; then
-			for f in $(_list_needed_subdirectories fatal); do
-				if [[ ! -e ${S}/${f#*/} ]]; then
-					eerror "'${f#*/}' is missing"
-					abort=true
-				fi
-			done
-			[[ -n ${abort} ]] && die "There were missing files."
-		fi
-
-		# We don't need it anymore
-		unset topdir
-	fi
-}
-
-# @FUNCTION: kde4-meta_create_extractlists
-# @DESCRIPTION:
-# Create lists of files and subdirectories to extract.
-# Also see descriptions of KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY,
-# KMEXTRACTONLY and KMTARPARAMS.
-kde4-meta_create_extractlists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Add default handbook locations
-	# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5.
-	if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z ${KMNOMODULE} ]]; then
-		# We use the basename of $KMMODULE because $KMMODULE can contain
-		# the path to the module subdirectory.
-		KMEXTRA_NONFATAL+="
-			doc/${KMMODULE##*/}"
-	fi
-
-	# Add default handbook locations
-	if [[ -z ${KMNOMODULE} ]] && ( [[ ${KDE_HANDBOOK} == always ]] || ( [[ ${KDE_HANDBOOK} == optional ]] && use handbook ) ); then
-		KMEXTRA_NONFATAL+=" doc/${KMMODULE##*/}"
-	fi
-
-	# Add some CMake-files to KMEXTRACTONLY.
-	# Note that this actually doesn't include KMEXTRA handling.
-	# In those cases you should care to add the relevant files to KMEXTRACTONLY
-	case ${KMNAME} in
-		kde-baseapps)
-			KMEXTRACTONLY+="
-				CTestConfig.cmake
-				config-apps.h.cmake
-				ConfigureChecks.cmake"
-			;;
-		kde-runtime)
-			KMEXTRACTONLY+="
-				cmake/modules/
-				CTestConfig.cmake
-				config-runtime.h.cmake"
-			;;
-		kde-workspace)
-			KMEXTRACTONLY+="
-				cmake/modules/
-				config-unix.h.cmake
-				ConfigureChecks.cmake
-				config-workspace.h.cmake
-				config-X11.h.cmake
-				startkde.cmake
-				KDE4WorkspaceConfig.cmake.in"
-			;;
-		kdepim)
-			if [[ ${PN} != libkdepim ]]; then
-				KMEXTRACTONLY+="
-					libkdepim/"
-			fi
-			KMEXTRACTONLY+="
-				config-enterprise.h.cmake
-				kleopatra/ConfigureChecks.cmake
-				CTestCustom.cmake
-				kdepim-version.h.cmake
-				kdepim-version.h"
-			if use_if_iuse kontact; then
-				KMEXTRA+="
-					kontact/plugins/${PLUGINNAME:-${PN}}/"
-			fi
-			;;
-	esac
-
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME}: KMEXTRACTONLY ${KMEXTRACTONLY}"
-}
-
-_list_needed_subdirectories() {
-	local i j kmextra kmextra_expanded kmmodule_expanded kmcompileonly_expanded extractlist
-
-	# We expand KMEXTRA by adding CMakeLists.txt files
-	kmextra="${KMEXTRA}"
-	[[ ${1} != fatal ]] && kmextra+=" ${KMEXTRA_NONFATAL}"
-	for i in ${kmextra}; do
-		kmextra_expanded+=" ${i}"
-		j=$(dirname ${i})
-		while [[ ${j} != "." ]]; do
-			kmextra_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	done
-
-	# Expand KMMODULE
-	if [[ -n ${KMMODULE} ]]; then
-		kmmodule_expanded="${KMMODULE}"
-		j=$(dirname ${KMMODULE})
-		while [[ ${j} != "." ]]; do
-			kmmodule_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	fi
-
-	# Expand KMCOMPILEONLY
-	for i in ${KMCOMPILEONLY}; do
-		kmcompileonly_expanded+=" ${i}"
-		j=$(dirname ${i})
-		while [[ ${j} != "." ]]; do
-			kmcompileonly_expanded+=" ${j}/CMakeLists.txt";
-			j=$(dirname ${j})
-		done
-	done
-
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmextra_expanded: ${kmextra_expanded}"
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded:  ${kmmodule_expanded}"
-	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}"
-
-	# Create final list of stuff to extract
-	# We append topdir only when specified (usually for tarballs)
-	for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \
-		${KMEXTRACTONLY}
-	do
-		extractlist+=" ${topdir}${i}"
-	done
-
-	echo ${extractlist}
-}
-
-# @FUNCTION: kde4-meta_src_prepare
-# @DESCRIPTION:
-# Meta-package build system configuration handling - commenting out targets, etc..
-kde4-meta_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-meta_change_cmakelists
-	kde4-base_src_prepare
-}
-
-# @FUNCTION: _change_cmakelists_parent_dirs
-# @DESCRIPTION:
-# Adjust CMakeLists.txt to shadow subdirectories
-# that are not required for the build.
-_change_cmakelists_parent_dirs() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local _olddir _dir
-	_dir="${S}"/${1}
-	until [[ ${_dir} == ${S} ]]; do
-		_olddir=$(basename "${_dir}")
-		_dir=$(dirname "${_dir}")
-		debug-print "${LINENO}: processing ${_dir} CMakeLists.txt searching for ${_olddir}"
-		if [[ -f ${_dir}/CMakeLists.txt ]]; then
-			sed -e "/add_subdirectory[[:space:]]*([[:space:]]*${_olddir}[[:space:]]*)/s/#DONOTCOMPILE //g" \
-				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${_olddir}[[:space:]]*)/s/#DONOTCOMPILE //g" \
-				-i ${_dir}/CMakeLists.txt || die "${LINENO}: died in ${FUNCNAME} while processing ${_dir}"
-		fi
-	done
-}
-
-# @FUNCTION: kde4-meta_change_cmakelists
-# @DESCRIPTION:
-# Adjust CMakeLists.txt to comply to our splitting.
-kde4-meta_change_cmakelists() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	pushd "${S}" > /dev/null || die
-
-	comment_all_add_subdirectory ./
-
-	# Restore "add_subdirectory( cmake )" in ${S}/CMakeLists.txt
-	if [[ -f CMakeLists.txt ]]; then
-		sed -e '/add_subdirectory[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
-			-e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*cmake[[:space:]]*)/s/^#DONOTCOMPILE //' \
-			-i CMakeLists.txt || die "${LINENO}: cmake sed died"
-	fi
-
-	# Restore "add_subdirectory( ${ ..." (this is done in kdesdk)
-	if [[ -f CMakeLists.txt ]]; then
-		sed -e '/add_subdirectory[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
-			-e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
-			-i CMakeLists.txt || die "${LINENO}: cmake sed died"
-	fi
-
-	if [[ -z ${KMNOMODULE} ]]; then
-		# Restore "add_subdirectory" in $KMMODULE subdirectories
-		find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-				die "${LINENO}: died in KMMODULE section"
-		_change_cmakelists_parent_dirs ${KMMODULE}
-	fi
-
-	local i
-
-	# KMEXTRACTONLY section - Some ebuilds need to comment out some subdirs in KMMODULE and they use KMEXTRACTONLY
-	for i in ${KMEXTRACTONLY}; do
-		if [[ -d ${i} && -f ${i}/../CMakeLists.txt ]]; then
-			sed -e "/([[:space:]]*$(basename $i)[[:space:]]*)/s/^/#DONOTCOMPILE /" \
-				-i ${i}/../CMakeLists.txt || \
-				die "${LINENO}: sed died while working in the KMEXTRACTONLY section while processing ${i}"
-		fi
-	done
-
-	# KMCOMPILEONLY
-	for i in ${KMCOMPILEONLY}; do
-		debug-print "${LINENO}: KMCOMPILEONLY, processing ${i}"
-		# Uncomment "add_subdirectory" instructions inside $KMCOMPILEONLY, then comment "install" instructions.
-		find "${S}"/${i} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i \
-				-e 's/^#DONOTCOMPILE //g' \
-				-e '/install(.*)/I{s/^/#DONOTINSTALL /;}' \
-				-e '/^install(/,/)/I{s/^/#DONOTINSTALL /;}' \
-				-e '/kde4_install_icons(.*)/I{s/^/#DONOTINSTALL /;}' || \
-				die "${LINENO}: sed died in the KMCOMPILEONLY section while processing ${i}"
-		_change_cmakelists_parent_dirs ${i}
-	done
-
-	# KMEXTRA section
-	for i in ${KMEXTRA}; do
-		debug-print "${LINENO}: KMEXTRA section, processing ${i}"
-		find "${S}"/${i} -name CMakeLists.txt -print0 | \
-			xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-			die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
-		_change_cmakelists_parent_dirs ${i}
-	done
-	# KMEXTRA_NONFATAL section
-	for i in ${KMEXTRA_NONFATAL}; do
-		if [[ -d "${S}"/${i} ]]; then
-			find "${S}"/${i} -name CMakeLists.txt -print0 | \
-				xargs -0 sed -i -e 's/^#DONOTCOMPILE //g' || \
-					die "${LINENO}: sed died uncommenting add_subdirectory instructions in KMEXTRA section while processing ${i}"
-			_change_cmakelists_parent_dirs ${i}
-		fi
-	done
-
-	case ${KMNAME} in
-		kde-workspace)
-			# COLLISION PROTECT section
-			# Install the startkde script just once, as a part of kde-plasma/kdebase-startkde,
-			# not as a part of every package.
-			if [[ ${PN} != kdebase-startkde && -f CMakeLists.txt ]]; then
-				# The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
-				sed -e '/startkde/s/^/#DONOTINSTALL /' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
-			fi
-			# Remove workspace target prefix in order to get direct linking to workspace libs
-			sed -e '/set(KDE4WORKSPACE_TARGET_PREFIX/s/^/#OVERRIDE /' \
-				-i CMakeLists.txt || die "${LINENO}: sed died in KDE4WORKSPACE_TARGET_PREFIX removal section"
-			# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
-			if [[ ${PN} != libkworkspace ]]; then
-				sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace strip config install and fix EXPORT section"
-			fi
-			# <KDE/4.11
-			if [[ ${PN} != plasma-workspace ]]; then
-				sed -e '/KActivities/s/REQUIRED//' \
-					-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section"
-			fi
-			sed -e '/QImageBlitz/s/REQUIRED//' \
-				-i CMakeLists.txt || die "${LINENO}: sed died in kde-workspace dep reduction section 2"
-
-			# >=KDE/4.11
-			sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e 's/XCB REQUIRED/XCB/' -e 's/X11 REQUIRED/X11/' \
-				-e 's/message(FATAL_ERROR/message(/' -i CMakeLists.txt \
-				|| die "${LINENO}: sed died in kde-workspace dep reduction section"
-			if [[ "${PN}" != "kwin" ]]; then
-				sed -i -e "/^    macro_log_feature(OPENGL_OR_ES_FOUND/s/TRUE/FALSE/" \
-					"${S}"/CMakeLists.txt || die "${LINENO}: sed died removing kde-workspace opengl dependency"
-			fi
-			;;
-		kde-runtime)
-			sed -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/LibGcrypt/s/REQUIRED//' -i CMakeLists.txt \
-				|| die "${LINENO}: sed died in kde-runtime dep reduction section"
-
-			# COLLISION PROTECT section
-			# Only install the kde4 script as part of kde-base/kdebase-data
-			if [[ ${PN} != kdebase-data && -f CMakeLists.txt ]]; then
-				sed -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
-					-i CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
-			fi
-			;;
-		kdenetwork)
-			# Disable hardcoded kdepimlibs check
-			sed -e 's/find_package(KdepimLibs REQUIRED)/macro_optional_find_package(KdepimLibs)/' \
-				-i CMakeLists.txt || die "failed to disable hardcoded checks"
-			;;
-		kdepim)
-			# Disable hardcoded checks
-			sed -r -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/find_package\(KdepimLibs/s/REQUIRED//' \
-				-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
-				-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
-				-e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \
-				-e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-				-i CMakeLists.txt || die "failed to disable hardcoded checks"
-			# Disable broken or redundant build logic
-			if use_if_iuse kontact || [[ ${PN} = kontact ]]; then
-				sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \
-					-e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \
-					-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic'
-			fi
-			case ${PV} in
-				4.4*)
-					case ${PN} in
-						kalarm|kmailcvt|kontact|korganizer|korn)
-							sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
-								-e '/add_custom_target(kmail_xml /,/)/p' \
-								-i kmail/CMakeLists.txt || die "uncommenting xml failed"
-							_change_cmakelists_parent_dirs kmail
-							;;
-					esac
-					;;
-			esac
-			;;
-	esac
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: kde4-meta_src_configure
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this one in split
-# ebuilds.
-kde4-meta_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_src_configure
-}
-
-# @FUNCTION: kde4-meta_src_compile
-# @DESCRIPTION:
-# General function for compiling split KDE4 applications.
-# Overrides kde4-base_src_compile.
-kde4-meta_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_src_compile "$@"
-}
-
-# @FUNCTION: kde4-meta_src_test
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5) if
-# I_KNOW_WHAT_I_AM_DOING is set. Use this in split ebuilds.
-kde4-meta_src_test() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ $I_KNOW_WHAT_I_AM_DOING ]]; then
-		kde4-base_src_test
-	else
-		einfo "Tests disabled"
-	fi
-}
-
-# @FUNCTION: kde4-meta_src_install
-# @DESCRIPTION:
-# Function for installing KDE4 split applications.
-kde4-meta_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Search ${S}/${KMMODULE} and install common documentation files found
-	local doc
-	for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
-		[[ -f "${doc}" ]] && [[ -s "${doc}" ]] && dodoc "${doc}"
-	done
-
-	kde4-base_src_install
-}
-
-# @FUNCTION: kde4-meta_pkg_preinst
-# @DESCRIPTION:
-# Invoke its equivalent in kde4-base.eclass.
-kde4-meta_pkg_preinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_preinst
-}
-
-# @FUNCTION: kde4-meta_pkg_postinst
-# @DESCRIPTION:
-# Invoke kbuildsycoca4.
-kde4-meta_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_postinst
-}
-
-# @FUNCTION: kde4-meta_pkg_postrm
-# @DESCRIPTION:
-# Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
-# ebuilds.
-kde4-meta_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	kde4-base_pkg_postrm
-}
-
-fi
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index c8318aa5c758..e527a5e0c620 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 0ae9c98fac5d..8b6740ce6900 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,4 +1,3 @@
-AUX mgba-0.5.2-imagemagick7.patch 2041 BLAKE2B cc3f8cb1dbee6a6917e8220798f9fcb69c02bfb76a49b8e5aef880b575d90d9247c20ef873178baff0b48917e8e89f1a00af61801dda70062b8f212bc65434fe SHA512 628912800231d1c084b55e52b63932e03ac127441cfffe8fb7d822a3abcbb15a038d8e1bfc50b4f36643f106d08c99cb3807c5de3e0d80a76074c82105c70a70
 DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
 DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
 EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
diff --git a/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch b/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
deleted file mode 100644
index 965e66466e5c..000000000000
--- a/games-emulation/mgba/files/mgba-0.5.2-imagemagick7.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2e3daaedc208824c9b8a54480bd614160cdda9e7 Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-Date: Wed, 18 Jan 2017 12:51:05 -0800
-Subject: [PATCH] Feature: Support ImageMagick 7
-
----
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38120827e..6be159915 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -322,6 +322,7 @@ if(HAVE_UMASK)
- endif()
- 
- # Feature dependencies
-+set(FEATURE_DEFINES)
- set(FEATURES)
- if(CMAKE_SYSTEM_NAME MATCHES .*BSD)
- 	set(LIBEDIT_LIBRARIES -ledit)
-@@ -431,11 +432,16 @@ if(USE_MAGICK)
- 	list(APPEND FEATURE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/feature/imagemagick/imagemagick-gif-encoder.c")
- 	list(APPEND DEPENDENCY_LIB ${MAGICKWAND_LIBRARIES})
- 	string(REGEX MATCH "^[0-9]+\\.[0-9]+" MAGICKWAND_VERSION_PARTIAL ${MagickWand_VERSION})
-+	string(REGEX MATCH "^[0-9]+" MAGICKWAND_VERSION_MAJOR ${MagickWand_VERSION})
- 	if(${MAGICKWAND_VERSION_PARTIAL} EQUAL "6.7")
- 		set(MAGICKWAND_DEB_VERSION "5")
-+	elseif(${MagickWand_VERSION} EQUAL "6.9.7")
-+		set(MAGICKWAND_DEB_VERSION "-6.q16-3")
- 	else()
- 		set(MAGICKWAND_DEB_VERSION "-6.q16-2")
- 	endif()
-+	list(APPEND FEATURE_DEFINES MAGICKWAND_VERSION_MAJOR=${MAGICKWAND_VERSION_MAJOR})
-+
- 	set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libmagickwand${MAGICKWAND_DEB_VERSION}")
- endif()
- 
-@@ -595,7 +601,6 @@ if(USE_DEBUGGERS)
- 	list(APPEND FEATURES DEBUGGERS)
- endif()
- 
--set(FEATURE_DEFINES)
- foreach(FEATURE IN LISTS FEATURES)
- 	list(APPEND FEATURE_DEFINES "USE_${FEATURE}")
- endforeach()
-diff --git a/src/feature/imagemagick/imagemagick-gif-encoder.h b/src/feature/imagemagick/imagemagick-gif-encoder.h
-index 13505e6db..842cad942 100644
---- a/src/feature/imagemagick/imagemagick-gif-encoder.h
-+++ b/src/feature/imagemagick/imagemagick-gif-encoder.h
-@@ -15,7 +15,11 @@ CXX_GUARD_START
- #define MAGICKCORE_HDRI_ENABLE 0
- #define MAGICKCORE_QUANTUM_DEPTH 8
- 
-+#if MAGICKWAND_VERSION_MAJOR >= 7
-+#include <MagickWand/MagickWand.h>
-+#else
- #include <wand/MagickWand.h>
-+#endif
- 
- struct ImageMagickGIFEncoder {
- 	struct mAVStream d;
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 3cb6c66f7ac5..3e50965b95e2 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index ee7a9de997a9..739968205a80 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -4,7 +4,7 @@ AUX chrome-gnome-shell-8-metadata-version.patch 1155 BLAKE2B be54db5312bff9f23a6
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
 DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
 DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
-EBUILD chrome-gnome-shell-10.ebuild 1031 BLAKE2B 84930cd830e45a09c545abd84809c0d2e923e06bac4b144081ceb695bdb2be4344542734f39c466a366fbb4e166ee1d32642d8131fb467d228fef7eafe6f1572 SHA512 78731f055dccf5340c0ac190199824c0cd3d7d674d4b2e01c40d0a864d227eb6a189ac484eb6e6104fc10aaa39c75b21f699aa9a132fe5813a4642e5689d5333
+EBUILD chrome-gnome-shell-10.ebuild 1030 BLAKE2B 3b0ebc2a53a667940ffe0748325723ce552c5898ed50e17d5b1f13aac39a3c58f0a913e1bda812b97e889aa7ec0b07fcc4482390d06cd0c47af27f36034c3a92 SHA512 39019e7158ceeb45ca15b42cabd99f345b6c61204d0eb46d56ca218d4fbf6aad67a478ab285aa337a933a9bea200369dad6a79aea0abf4349c89cf77d18e4a08
 EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
 EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
index 09548f73bbc3..af7ab4aaf737 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 917f72b57fdc..2b62f61710d7 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -6,5 +6,5 @@ DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e
 EBUILD cinnamon-control-center-3.0.1.ebuild 2611 BLAKE2B 9a4ba0fd9dbd45cf87cf1b2ddafd26023a1c7e6c3cbddafb7072b6ef8b99d8d80e3f14483533e9a9486a3e9102a354b11cfb2828867577fc08461154bd62c3e2 SHA512 f4373e0845807fc3182a086ebbacee8e5a18c015c6ef2d1c2f00211cf8f3ea162f9c55daed64b5a1c100d3621d7446ca6bb8f4cdec86099a2ab51c911fb52fcd
 EBUILD cinnamon-control-center-3.2.0.ebuild 2585 BLAKE2B 2dd57986cf8c80549a91ae4a0934aedf09d4c6fb577ba9c75cfcec349c4e2cfe082e6f52988b4084294ca014db1181ae343b34d75a47f05a4793b6ff6f9c80a9 SHA512 4dbb1a7f539a6a38e99472ada1703d0b27a6e761c62b266b500b9b66e59a955d698387431e9f8adfbf68511bc9a8ff4e5d36c416d5d0314406990b49a11e595a
 EBUILD cinnamon-control-center-3.2.1.ebuild 2561 BLAKE2B 52a21e3c82a9a738ac88f1a3cedc516c3510e05072f3b2d0b85553fa7340e87917339cb490893f77a15480edf117953b091423b8c713642e3e302bf1cc00f3e8 SHA512 423385581a6c1702d2064aca5a3e85eecbd0e43c4fa92368ff959e92891fac2aa1c411c7cf215e73900917844ce281bec3d4b37185cb148d172e7236bb0d968b
-EBUILD cinnamon-control-center-3.6.5.ebuild 2509 BLAKE2B 0c4b387005f7659cb6881aabdc7a5c77a57ccadc59d41a07abb0526073b423b05ece976c88c452221f4fb26e69c0171b89d37db39e145ea7efc4af13a1bf7c2e SHA512 3b3e9c7f13f596b0fcc83c3e02d18e81db1862d78e78a449d2626885b401a0f11fa4b73627763cb6174e5e1b6fd88d13d7484dca2cd9df80b4c4d9c053ae4db7
+EBUILD cinnamon-control-center-3.6.5.ebuild 2508 BLAKE2B 91c594e498092458fdddbe9e36b84ca0aeb32692179509080c1a87fa91f02aa3d9fed0ff0be36135a0d7da642568c327893f9551c158f58fa889d9d6d735229a SHA512 6d62a181a724431e12ec7b234858ac1cd47d6e6bc8e4f7144534ccd8d2fef72aebb01e76a55f6a0ee4a1b63e85445fb6431da5ba10670b814ae3b7de767077ad
 MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
index 7204e5d76bcc..6cbb46fff26d 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index cf0838ec2a3e..4f258766b99d 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -10,5 +10,5 @@ EBUILD cinnamon-desktop-3.0.2.ebuild 1697 BLAKE2B 545f0aadd610e177123e4eee3060f7
 EBUILD cinnamon-desktop-3.2.0.ebuild 1673 BLAKE2B 0762ea6ff30652e4ec1a4772bd714f2c4d12d5100962c959fd4c1fd56a26b38222281d063fdd4af6f68fd997c6e777a085b0bac3b8fd7bf407cd40718a1fe72b SHA512 82a24036ad9e62d4417e5b0d823d1afa414d3336e645dd24a0f248a683385f5c42cf73c6e64540d601ae9f1f258e4a4a9457d51e69d11984ae6c36e635be95c8
 EBUILD cinnamon-desktop-3.2.4.ebuild 1679 BLAKE2B b687238b60628262cb6d3d96614b831d29e4e5ef9fa47a359c1b0ee5e001d2d2e030a2be447757ca0dfe6bb18646a1db3e2b36b1fd16c1c53013ba3fa341ec9f SHA512 3ffe482cbb3993b554832a377b0192a6bbe2c3b50f92b7e0ead48a99877b19aafae6b109c84167310b8d7cb19c7bbd98eb01f43302c15acf7399f8ae6f4fdeba
 EBUILD cinnamon-desktop-3.4.2.ebuild 1705 BLAKE2B ca49c74af422e94772440d734e4efb878634c11aa3c315cc65fd32d091a9793ff1b64920dcb40f3b33663b0e279940aa73bddc043e33a6933ada0a9e5ac5b615 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e
-EBUILD cinnamon-desktop-3.6.2.ebuild 1705 BLAKE2B ca49c74af422e94772440d734e4efb878634c11aa3c315cc65fd32d091a9793ff1b64920dcb40f3b33663b0e279940aa73bddc043e33a6933ada0a9e5ac5b615 SHA512 02fded4450d126d41528911207e6073c4e310bdfb2c2e786d73979b9a96cb59ff4ab4e28628bf11c9eda4a5453a3bbe96bd85c857cce5459f6235e0375dcef7e
+EBUILD cinnamon-desktop-3.6.2.ebuild 1704 BLAKE2B 6470a22b54218e636e360e4d673c3a32835ed897d17bf8da42259bb279333dc318fc87048a2628e6a6b8c19e60a0c8da51e4f71c01076897e933760ec3174641 SHA512 d1d488a64cefbc9d50582c8603f641d65c401b0d912aa41a5771ef5d4bd5e98b22891162c9a1d7d704138ce24fda2fb7d4bdf99417b4bd8a6312a52789c66c77
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index 547abb541964..4b46a69a32f1 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+introspection systemd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 32ac42ee911d..422b6d4d9751 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -7,5 +7,5 @@ EBUILD cinnamon-menus-2.8.0.ebuild 911 BLAKE2B 43fce9e96cc04fb796bb8d8a444dc8b98
 EBUILD cinnamon-menus-3.0.2.ebuild 869 BLAKE2B 9c69ea8169fac6ccd0a5dc03b9bdd2ef592a957e796917f48ebdd383d53c3b2d67077c430ff32b58fac21791ab031fde1c35bd92479a16a857b6ab81a64c6f99 SHA512 2723bc1745a7ae044ac58e71e6b3968e1544690640bef0aeb6e2c292805c0961a57dcc6e2cdd1cf1941aae613e4079ed563bf01824bbbfb2ae0dc7bea9b6ed94
 EBUILD cinnamon-menus-3.2.0.ebuild 871 BLAKE2B 2b60fe6584081a917aee991e353f461c578eb18995f9abfd516d3c83df5524b6259984d7d5453f0704cc8af6532b4dae784ce7df0fe3100f502596e3ad58d184 SHA512 23270c9b4ba89e41481690bfe62bd3a87908836cbe7beffbb3d99a4e23a13d27c348b8806053b78b9461d1b601981806700e5415d42556e9f5fc6198db607d3b
 EBUILD cinnamon-menus-3.4.0.ebuild 871 BLAKE2B 021a856fc81e7d4c0442c55e18098ba0b4c5af442cc13a8590de2bcd8e9be4e67e901c571af611f748295e559862cc1097d300f20b2f7d2c07c3e7721eef8d4a SHA512 7f2ba0cee5846fc29184a5e0c85f622828f4a1b40b57b75a856028e8b7ed1b221fe69587c9db8eb55f88869fc4beed59f84ba740b506db3b4fb427adc20845a1
-EBUILD cinnamon-menus-3.6.0.ebuild 871 BLAKE2B 021a856fc81e7d4c0442c55e18098ba0b4c5af442cc13a8590de2bcd8e9be4e67e901c571af611f748295e559862cc1097d300f20b2f7d2c07c3e7721eef8d4a SHA512 7f2ba0cee5846fc29184a5e0c85f622828f4a1b40b57b75a856028e8b7ed1b221fe69587c9db8eb55f88869fc4beed59f84ba740b506db3b4fb427adc20845a1
+EBUILD cinnamon-menus-3.6.0.ebuild 870 BLAKE2B 58a9937d8ac2c778a201d68a913691a3de710c06186c8db7c3f4dae056adcfa8c62d9314e8f4bd59fd320066f82dc050f857a062f0f2b21facde2ef37ad79951 SHA512 7a23f85f6706077957b15a4dcc633dfd6172d313a0ca1344bae0ef892f2434b9f29c953d7560601d1eb3c999b2e2828988db64dcfb5bdfaab10ddf0c17b09baa
 MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
index 2dece04e2b33..abee4c4dc110 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 4669c0bab9b0..6c0fcb5ad79c 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -18,6 +18,6 @@ EBUILD cinnamon-screensaver-3.2.2.ebuild 2094 BLAKE2B 5c2f6423404a45214fe43e00be
 EBUILD cinnamon-screensaver-3.2.6.ebuild 2159 BLAKE2B 32d836992715ce4587caff1e0d41e2cb580a9e8966a3a58b4411c905604796e2eee84013f4ae955eaab22b38b8cec7026684d2577f0a6f2c889ddbb0e33dc57e SHA512 47ea8d306639cd452ce2bcaccc041a83cc52016ae3dfbdc670c2843c2753ae6ece01d1b3ca83d9252a2859935aca93c69800826404955b2503e43a5d17043aaf
 EBUILD cinnamon-screensaver-3.4.1.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
 EBUILD cinnamon-screensaver-3.4.2.ebuild 2248 BLAKE2B 0f89284cd790bb25c5a262d4c6c8e36c3f41040c01f837f91643365bc55abaada7046d21739371e51992fb8e4e24e0668ead9edc1e9bc976b8ed648b882d59eb SHA512 d5972271196e6a35911d79f4929fa55c3daf169fa8fedaa03af59b158aad05d60ec6545b48fe900384154d193b3fbc5fced2b2dce319c577278231e0b3e8cfa4
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2099 BLAKE2B a35f7f3e32850d3682b349b5c88065a608764624cb170d7a101a341b97b31465bc9b6fbec23edfae2cc0293b35e6f23f648f1703a84d6c832d3694394650245d SHA512 74d52fb6fdf937a7f5d8c891b4e5227449b87c010713b3f1484cce645f4aaeb7160a0d066cb79b473ed13b86b9003ab260d40df5750c9c0acf65d95990516e53
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2098 BLAKE2B 276c45a9bd4b410781baf566f9ff5be439cb39d23f5f82e219bb005f4ec856005a3db82cb978692442b1f3f604062e8af3b837e92025730f75c0b6aecc49fd3c SHA512 fb081b20b4f84bd26e5ef15844f2e8048c08f1f6a1c8d47f54f0271f5a9049c1fab4274a7fd6c71ed584f3bed9871cf9dcf52c1b3b60df2d2e27473f0f225cbc
 EBUILD cinnamon-screensaver-3.6.1.ebuild 2213 BLAKE2B ccdcaa8a67c5d27952de8753c6030f98dab82f586a011ac801a4105f462a967506b412badae0ecd587c3ab93f58ff9c23aa99d7b6fa03be1625d735f8a3e44cc SHA512 369929a2a9acd868b1f5aeecfcb754fa5c9fdb28fd69c6dede76b2e27cedf2d3f91db5a2888ecb4863b2a395dd2ff1321415f71f8b855ef84cd6338557f03382
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 57085c813e0f..2b3271186f9e 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc pam systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index fb1e746d2b48..9590fa65a459 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -15,5 +15,5 @@ EBUILD cinnamon-session-3.0.1.ebuild 1514 BLAKE2B c11e91af2692addda8cb991216b4bc
 EBUILD cinnamon-session-3.2.0.ebuild 1516 BLAKE2B 0ae4a2d7091ae89542a9fe48c49ee107acf352c0844c7a7aa7ee1a704329616aebc6287fcd97705b7f6a3978644e36cfad4e81d7c5bbafd0d9958839b2ff1419 SHA512 5bcf426ccfea1d07cd8679a52e4c9bbb45301459f425e549b4fc700c8a9fd47aa0025390dd3025ee6ac48692467cabc2591ac817e4a7d229e9ea64a140a1d7e2
 EBUILD cinnamon-session-3.4.1.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
 EBUILD cinnamon-session-3.4.2.ebuild 1516 BLAKE2B 83488fb908998effe8ad1ac8e3f45b00fc941b6d34cba67d1996808ace9e9aad38f32601ebc3e731733cf4cbe47edaab0bdc5c2f2cd3126a0375a89c0b4bee37 SHA512 9d0aec5ac77901ba904bbe8f7fde160b5d4d993b779f5708dbbf7c2e783e873052b6470ed4099a7ca516c55fc0cd9d11a396d7c2f8b32fc5d0a5bd08abadf740
-EBUILD cinnamon-session-3.6.1-r4.ebuild 1542 BLAKE2B a478ffe7d1da51f01583e94a8478749296c5922e878598d8ec4d402e9e27de58f4f5e779d1bff1ac0becb00f1fbd9dfd1d39da0a0d654477d3f781a8ff49abd8 SHA512 9744d0854472e0fd449a3261c1113ff2085f2fd1c1584cae513daab89e91843b06cc977bea8722416d80c5a69aa209a6ba6af6cec2ee3942f6fa9eaf92cbf564
+EBUILD cinnamon-session-3.6.1-r4.ebuild 1541 BLAKE2B 04ce5b6f3114f89857f57a8c9071354e3251458a39bdf8cfda864363f5ba8c0ce375ce75a27536e175a0c70c60583b3a32535e0fc0d232cd3e106fceacae849c SHA512 dfdb609882005422d4c21971398aa8c9154e6ae7db7cbd4d09b9b8173ac2bf73398cd3c8a528e0fb7d8d4ebb571fef90a5b61b1f2542af08ff4f5ec6b577825f
 MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
index d5da4702700c..6b31c66cc102 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc ipv6 systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 075031948695..7283033647e1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -13,6 +13,6 @@ EBUILD cinnamon-settings-daemon-3.0.1.ebuild 2127 BLAKE2B b27f8210d431bb09563863
 EBUILD cinnamon-settings-daemon-3.2.0.ebuild 2129 BLAKE2B 04a7d41002d9ae54699c3d6797c8d58240a2239a8a43b8ef995126703e74f6fc4e73b810c98da091b5ca71568da63acf13ae07894ba9cdc5dfca6150eb565c26 SHA512 df00468ad86b1d7327c53257f6157ea771ee419a02c9c088477886acd5d362aeb9aa3126c8f30d3d4c59aff2f34176d00f0f9a575947e4be935bfc36ac4dad99
 EBUILD cinnamon-settings-daemon-3.4.2.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
 EBUILD cinnamon-settings-daemon-3.4.4.ebuild 2129 BLAKE2B bd195a092c8f68255ba5a2c09815a5311e4c35e2a281418bab097f0c78770207efd1ce6ac4ced749f965e75ef677ad8f2112b2d25ac653a2425a279e139424ef SHA512 18e49014871be8347a777fdc0d1833360173815280552bd88f1b547b798d33714718113b93ae8f8ee5ca80061c1f1e63073e29d45f1723b66b6951d02f8f96da
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 0f4d9470504699d50f01e28724cdf9b0df33df3de57370a83df5a2bdf647f2d26f364dc4075fd73baaa12fd6aff091618b280492c96ab470e2dbf95f93d51cb8 SHA512 a8263d140b47f940fb7b417ed56e758d6914b6e86b21ccb599be4f4f77d8275b1dec3cc1f9c7e0cf6e1ad11c857a0b69190e4dbfdeba633dc461afbad4b67481
+EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2041 BLAKE2B 3d5dc888ac00e6a4cc77f8a5f55853cfb689c5d314e96cfa380f9a5bfc67514ff5c96839b80ce4bd3abe8b6d8d83b4cdf0e2d17b5ecaa2bb67c50c08a176ff93 SHA512 e1dda48d52fa43052112aa2f6b8941bb901c60015f3db85e8ad538e77360d00b299032fab0d247dc793edf01658ed4f548c696ce3064b6b92b13b868fc4ffc32
 EBUILD cinnamon-settings-daemon-3.6.1.ebuild 2096 BLAKE2B bea3fb08478f5b018dabf2c9c3ff1d4a0442eb226757cfd761d3671bdd9c6460ed5db7afb253586a9295561e7d53caf278b895c4dd666bbddb4bfc7069aa3b53 SHA512 50d49219acd3b1919dc8273f2f73249961bcc591823da39479550bd50a6d73bbbde3d907d9452ac9b14329a42b900cd3cc4617e69cc4061edda4f5f0deb8b928
 MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
index d0037fe9aaf4..8b6c38c6c964 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 RESTRICT=test
 
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 3109f3908325..18ec2fbae25f 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -5,5 +5,5 @@ DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f
 EBUILD cinnamon-translations-2.8.3.ebuild 1332 BLAKE2B b43c026ba0fdceb789f88acc3d7168786bca3890800d149fedb649541e66223c58001a05be03ca309285d3ef62e484916ce2d12700332bdca15ac85ed3ec8cbd SHA512 c67ca8b9b34a5325bc3270e63361a6d88abeb9bbf74e221864a5c5a78498dc65d8c59263ba349b2bd112d375cec0164c2fc9c511f32bf671e44fa644c9e3df90
 EBUILD cinnamon-translations-3.0.3.ebuild 1309 BLAKE2B a97b741cada86a5c09c99d1db2001ec18ba44ebdfd5836c4c4130342c73feca67e38ecc73bf21baf6934b130acfdd021b2a9d1e04b35bf5a95191f434288bc8a SHA512 ba36f43ca6821aec047aefd7f974ead3691aac0f9c2cee1c38bab8b0ebc9ee9dff2d023f2c9e6358ab5138279900711ae0d80993630f82b5907ddd1fc55d91c8
 EBUILD cinnamon-translations-3.2.0.ebuild 1311 BLAKE2B 0780f240e548eb7fc86d4b7dfa715aa8d0e14b715f4b99b76accf6f01a7071a0fa473c8ff6eb6b25725183332e0c590091c2b4ff4134aff4263d83eb344c3cf3 SHA512 b30dae34a0203b22459f57a58dd0a97ec0b69ce64ef1447a2d5db1cc7cbe314a4e2da1570989ffb73cc495b647818f87d244a0f0e009b4243d2bb562b86bc908
-EBUILD cinnamon-translations-3.6.3.ebuild 1311 BLAKE2B 47adf6112af4f2714bb642578da9a472e61d8f30e7de32221238afffd303b17e28121e2f61067bd83c2cbaf356c98113e81bb9093b670f011f61ec8c988a23ee SHA512 f0ea9dc68aa34ccd97a99691057a7ba0524a4c07b8bb8a5cf73ac6f203738b5fbe92f07e8faf4adaebd2c4f8c3975394c129abb8a17d0b97c0051e3df5dac9da
+EBUILD cinnamon-translations-3.6.3.ebuild 1310 BLAKE2B b066b9dbdf89839a47a6105d57a8f65aca994b345e23671a7ab3caa023affb656d59c710ddf5013826b8f2952c6701d84cf0c26171d30da1b344bd0efe63414f SHA512 93baed12715d2d49e6a844256c59e42b3b24f70ec884f31f65bfa2573595ef880b44cf2a295afbb01cfaab412337d8b65804f95a1cd4d9c32477f4a13142e532
 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
index 832916ae5f4b..602daa22a450 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 2168c1d9d37f..b050a977119a 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -17,5 +17,5 @@ EBUILD cinnamon-3.2.6-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf2
 EBUILD cinnamon-3.2.7-r1.ebuild 7914 BLAKE2B 39a36d52cabb14fd6189cfa135af8bcedf21797d0cefff2d8c91fefc0d687d8fa341524c23e0bf6411210bf05c9ff7632677ddb3d7d410360c63a8735419ef76 SHA512 48b49241719827b0e283d65d9164a1e4f780de70ebb3f8d82dc3e74b9572552506c1e5f6df43553bc446f33d45802889b1f8828f753ddd19955d99cfdb1bf3a0
 EBUILD cinnamon-3.4.2-r1.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45
 EBUILD cinnamon-3.4.6.ebuild 7784 BLAKE2B 2f0cb390f83b94c46b0bd34544a90f12342445ed4dd0cf0b8f90b170aa2a81cb29d596a0d17ffffd983032f422bca2d8cf19286f55770f1b410a246cafdaac1b SHA512 1aea09dced11566564f1ed15b450f320bda11dcd3673530989b242093e08a8e1d42cba47fafe3e226240d0173b2a725fe2ae8e1a4826a5b5c772a7f302241c45
-EBUILD cinnamon-3.6.6-r2.ebuild 7644 BLAKE2B 637db1083bfc8644e853da4884c8a13a672326bd05f545f109d461c35d84a368f974895b781ba40373a0f4e22d5e1c9647536dc4427b7f95db8afbde8cef7282 SHA512 871c8a6a231ff26911a32434c7cec629a900c030f638a2aa4f31b818994556b79dfaaca87931118ca444c40c3c11b79a2afb5c434ed36aa63899884464243d69
+EBUILD cinnamon-3.6.6-r2.ebuild 7643 BLAKE2B 81ad1d462d548943f312e328f3ebc18047c805842c2fafbdac1224734ee0f44756fc15fbe825a2b2d57e453032a4b69caa34ffa579887f3648c7b0eff2c86935 SHA512 03eef9e489778c7fb0a7ad4d165013bcb52efc00f49b47a88053e8bc7b715e0fba53199c45ed68a16a595d0315cf49d934692a9d3fdf628acb7b7d5ee42c7d6b
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
index 25619ca438c4..696a68bd6943 100644
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( $(python_gen_useflags 'python3*') )
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 9ffc14b83b4c..116040fab0d9 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -9,5 +9,5 @@ DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f282775
 EBUILD cjs-3.0.1.ebuild 1664 BLAKE2B ee654aebaec13f1e43f5ca10e493b18af368ce6f67cb7b20bcf59c0da29aef93d3e6c8752f34f708cff632e6a0d4b167e2eafb6729656406bb6daaa659a45349 SHA512 59de06e7315032403e0a831168ae45e5cd0da3026bd8ff583dc48d325ee4faa47951f30aa18eeb15cbcae501ab51faa7b4df81f263ad2fbb3f44ac159418fa7c
 EBUILD cjs-3.4.1.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
 EBUILD cjs-3.4.4.ebuild 1511 BLAKE2B 49b7799669495fae66139a2e2de3a246ff5705e7cdb0ef95302331b17494f40b4f4ee5a86d6b21391cc2a6f16ae278f6074d05ef918371aec9f2d01f8f24c620 SHA512 864f3058675865af299fc7cb57d562d3c20e13f5afd3c4b807cbd579c960c2192ee96b3dc60917be4f9aa12c2690098c16481e4dd14bdb48674325ceb6f1455e
-EBUILD cjs-3.6.1.ebuild 2101 BLAKE2B 5f5b963bc5fc4bb683aa4035bfbef54c06d8abbac24d819baf6e1a58abd0ffb88c7c685c3d7ba9e9fc7cdbec872ce622b76b6de6888d925a61c1db375b5454b4 SHA512 58e91ffe429778b8b5990473cc47df5fcea0b433f95d996bc00efe45bfb21124eb8214e36feec0b9fe6ef1cad2cdfec6023f21e5a7204739d7c689a2fa240269
+EBUILD cjs-3.6.1.ebuild 2100 BLAKE2B 630576c48a8cea5518510b9fa563eb540c3fbffce6ba3a4cedd59dedfd283694f42bb369175ae12f8fb051594edf85c41d5b4e68fcc3c8d5c3727bbc11745921 SHA512 3b133aacd44353bafb74096f3ff3a6ce2ea47cfa18769c5fabe2ae72229f45dfd842e1e0f8138e129fcd9590948980a7d74ce32389a4d8a624bf19fad094ca59
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
index 399708932f15..70a71a391610 100644
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:38
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 2e3b330a475c..6245b7f0fd2a 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -9,5 +9,5 @@ EBUILD nemo-3.0.6.ebuild 2057 BLAKE2B 7307d19383728b51d7f5811f46fab197b9dbaa048b
 EBUILD nemo-3.2.0.ebuild 2037 BLAKE2B 48d59e3b2531dd65e19d51b7539cef48dfb625974b1ef306e804929b53ebae572819fa74e97bdd8498d8f7cb0065fc8c490b22f817d517b4f4e0f743f5f4f375 SHA512 192ccd9436b6e402d0631b32e35955f371136204e46357108805f4c14a455d2a6389beb553cd07b35de28e6c34c42434b1b1a6776d46af75622dcd167d335a30
 EBUILD nemo-3.4.4.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
 EBUILD nemo-3.4.7.ebuild 2058 BLAKE2B 1b9d3ee099f93d059a92c787dcfe96967be9338c4950fe4bfca96518b82852af10451e737f6bc140f9ea4295ac85ed75e430cab251f772d464c818979437ed0c SHA512 9708445f2223b2d856636fded2268a1da8fc0cf040b2e18380facceb8f74e44703da7cf2069ed8685d014ae5b39dd181e88f601f83db3c0ba98f26edc55fe179
-EBUILD nemo-3.6.4.ebuild 2082 BLAKE2B 2cf8e115cb8253135ed6cdbcb3054356aa0bec3c249c4f00b192cd0c27a40839d8ae8136d66b955091b0b60b857777d6073569f8b1f5eea18392cc7ab1c98490 SHA512 7a9cf5538d331b7e210540b4c7b8a4fae39fdb8cbd1fff42f9f8e88bb56959ffc00bf00bbb9e9a12ab1392d706d780cafc0cf2301470174390c02a85e9d03c7a
+EBUILD nemo-3.6.4.ebuild 2081 BLAKE2B 75c87cf2f6fb3144a686fa467107cb4a1782b552b47775fd85876a3821cd0db09af8af584b3d9496040443f8e5ea17a6e74fad0f91127f06a55d0d1c4b43821b SHA512 03d2b0ff78d79a3230cda4a3b31f7a2d833185d3e8bbd6f92c5fc95d85fd3c79061beb16486944157df81319d4f6709d7194a9bd53760ade4c8ad55abe936d72
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
index 6332a6dd879f..6bfd88f5fade 100644
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ b/gnome-extra/nemo/nemo-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="exif +introspection +nls packagekit tracker xmp"
 
 COMMON_DEPEND="
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e0aa5283730b..2435f180ef95 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 39a290803aba..33cef4f38cc5 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,5 +1,3 @@
-DIST zanshin-0.4.1_p20170701.tar.xz 358700 BLAKE2B cda820dab0234568f94aa1511fbb542eca921a3bd78b4f3f85e5e14147c8326041163b76448982703a3e043e2f9f7d099f41208b6d09d6cf492e2c8d73e8079c SHA512 f4725e72e3444f16df18058abeb3edd3056a95eee47b6321171043e9445886caacc18ba7f7aa8b346e41c099e36c0ce068cf709dd03c2ed78f35bab30b2a56fa
 DIST zanshin-0.5.0.tar.xz 438300 BLAKE2B 323f7f8545ba59daf2e62af6873be47b81e62b808495757752e4a33e3b0816c63e0e08979695c33cc70b4aebcff6d30814b8cbb400fe64af5329e72501639399 SHA512 9e4f01ee622a07096b7cc234a6a2f0b35501497efb662af590d4c4fa3f55f21acc528bfae10e92da8107f26f3d5f4b777730512c97017c36cad96d6e6cb28e43
-EBUILD zanshin-0.4.1_p20170701.ebuild 1658 BLAKE2B df378985562224066908ce88da6697ebad67cfc3ab78b0427f2c063b7862451a96480296f7229a2a6fe35d8de87dfd12854e41081349639932868f08fa358b2d SHA512 e08e7f259a96c337795d6c54a0b06ecaf1a9d8842b49ee9ae64d02f0947349e47e03554beb5571dd65118d02e0f712c7b10ab932f01f8f5612ff51d7329ff4c4
-EBUILD zanshin-0.5.0.ebuild 1672 BLAKE2B fad2957d070dd926f9e19eb342702639af1fd36769d8c19450b9100dfc9dcb93dcb6ac23dbfed54395ae24a612e9d6477935e3795a6aa285c69deaf2223d9106 SHA512 f718e47ab2afa932eb589784e6baba52ce3bce67eb5543546c3a6a57ed155c29c681db227bf0503c14459d25c6b201537747711afb02790c27d7b0de26f72553
+EBUILD zanshin-0.5.0.ebuild 1670 BLAKE2B b9aa04c09feb337efd9140748a46422a387d95541b76771b97cef28f081f927bb13c47355279c4aca84f593f03a3a031f697a2722525308d919b99855d9a2705 SHA512 2811d78d28ac125e78ee7d48b23e20e88eede1c547bb7943251cbb1c93912e4f00ab6ec40c5a9553ec8ab73340b4bce540a643e0e59f950fbdaff81c9fa83495
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/zanshin-0.4.1_p20170701.ebuild b/kde-misc/zanshin/zanshin-0.4.1_p20170701.ebuild
deleted file mode 100644
index 1f41e1bd46f5..000000000000
--- a/kde-misc/zanshin/zanshin-0.4.1_p20170701.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# FIXME: bundles libkdepim
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/zanshin:4
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-misc/zanshin/zanshin-0.5.0.ebuild b/kde-misc/zanshin/zanshin-0.5.0.ebuild
index 281fb6c561ac..3a8f084bb7bf 100644
--- a/kde-misc/zanshin/zanshin-0.5.0.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://zanshin.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # FIXME: bundles libkdepim
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index e5a4d6ce6fba..056381211b59 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 8c4637d3c750..8f6736748e15 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -5,5 +5,5 @@ DIST mutt-1.9.4.tar.gz 4197655 BLAKE2B b34224622f590f2cb528644c636e6f5ddc39215f8
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.4-patches-r1.tar.xz 114212 BLAKE2B bb14bb8ce8c2088dd32d6528f60e666d213aa557ce3f830f8ccf6e9199ea2083ea8b6605bee7aba6e96a40d127c076a581de656eabc257a00aa584fba6263fbd SHA512 c011c24767ad8b4a096a91c8531f923057e98e4439f0d0e00e70d761b434fec8c8bb1394e765b3f1be16212df76f99abdaa4f3347299c88f4c73e9b6d13525e3
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
-EBUILD mutt-1.9.4-r1.ebuild 8854 BLAKE2B 5a6ac8ccb2ced801ecf3c935f5f6894a2f165294e257da878dc57a91f4df160fced58a4650265b573ff5f1dcca805f915925261a20bd0bb7c69bdd6f302977cc SHA512 2f6be5d70272dfecdf8328d69ae3625437fc68ecda44860b02ab44d38a41c7457aa4af134c19ebb145a132e87bbc2fcbc38f1a1d65fedcac853ba6bc325d4b80
+EBUILD mutt-1.9.4-r1.ebuild 8852 BLAKE2B a16320bea0df08d20e40087a320b757a82e98df7c293103f9cae10ac1f5539a8180cb93fc2a33e8c88f3d13cf23a2a5a41c891b33cfeb591b35f21bd54e34a3c SHA512 e4acc6b28b04b35c62899173336a7aab99766ad01de3b4f10b6b16feac1e91ba54df61bf2aa73090dae6df6a917aa4ab13d1fa6469f9a1bc42759da9348d5b53
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.9.4-r1.ebuild b/mail-client/mutt/mutt-1.9.4-r1.ebuild
index 85ec9d834dce..158b60319d21 100644
--- a/mail-client/mutt/mutt-1.9.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	kerberos?         ( || ( imap pop smtp nntp ) )"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 CDEPEND="
 	app-misc/mime-types
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c212d0288c92..de759e266f58 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/kochi-substitute/Manifest b/media-fonts/kochi-substitute/Manifest
index 43f69405c2ae..b063b6b01706 100644
--- a/media-fonts/kochi-substitute/Manifest
+++ b/media-fonts/kochi-substitute/Manifest
@@ -1,3 +1,3 @@
 DIST kochi-substitute-20030809.tar.bz2 8675822 BLAKE2B c825801d5d47ff312338393c09c5d2b03923fe8b6a5434dab36acd855a27a9f167409e8562f701c7da5dd4b313d8f19e18b7ee09c63e9d024cd3a2bade3b47a2 SHA512 24d990383aa1afb32523d05577da48bf07cabe0814af9c2f10c55d1db6dd4fd5e4b9df566431fe25f871f78494e62c07d5082c7596c50c410b45bf33ca9b2105
-EBUILD kochi-substitute-20030809-r3.ebuild 769 BLAKE2B da0202d5dd8f59ab72ee432fa696302a743c0fde5b321f6a3c1b3f428aabc2ead327417fb80c870496983ae1b372457ecce8e423b641a499f5315a6f2d99bc5b SHA512 5dd7af99fb4df8ce5c1c6104cc5082b406f8027bc5bc2142f1a4acd3d9a047266fa866cfb0b1b647bf92b0c1b7905a403961b1ab0168e45a49a8e7f55dbb5480
+EBUILD kochi-substitute-20030809-r3.ebuild 780 BLAKE2B bf8838592f2751fb5a2d7246616f4de28f749c2c92ae834e19e0109ecf33a010ed86116ba37cbd624c5df25655bac6c38a30e7a786dd07b0711828f1a599c9d5 SHA512 8c08dbb13d67c652b8e701f55ed14ad22029e797732f93e3cb00700d04dd0658579e7dfb66a3b6b83c748ee000c9ba9a7e114684c99c7e66d040f54fa8efd332
 MISC metadata.xml 411 BLAKE2B 45d187e943f3b8d4b8f906a9c70a534e98f0d1d1f8ea286bd9ee3870e61cdf740d77549e9d06ae76b748f7dc1dd9bd6bdf95b3858665508eadd91c7b9d22dfbc SHA512 22921fcf5fc45637166d6b028332f6cee041800aed88b5dc390c3b8fffc2d9184e7c468cbe1418232d77a96d76c8c68f1ca6c80109fdf47d9c4de9f4ad5bd9e0
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
index 2bbb119adc45..d42ea1c137e1 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit font
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge.jp/efont/5411/${P}.tar.bz2"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}-${PV:0:8}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6840ccf64bc0..2ca9f9644e08 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/dawn/Manifest b/media-gfx/dawn/Manifest
index f777eae514cb..2e9193a4ea68 100644
--- a/media-gfx/dawn/Manifest
+++ b/media-gfx/dawn/Manifest
@@ -1,6 +1,6 @@
 AUX dawn-3.90b-gcc7.patch 513 BLAKE2B cf0e95894bbe85db5bfc45c1ef731dafd593c4531711bce931013b921a82b5306ca31e68dfd4f5a5b9fcf70b1bfc51f4b4c1a015725acaea6d7ac6703fb2cd8d SHA512 784659c383e1c240f5ea9def2bc39429fe726960356ca57ad07fc4e0415053f6bf9125a09ce54a1a1591b2ad9887dbc01619fa7f566d249d86767ed798f2345a
 AUX dawn-3.90b-no-interactive.patch 5467 BLAKE2B 2d7bfe6cc17143dcd2c33492eb45a77ecc44bcad9685f147c4a69ad0ec6aecced69c9e9de6d27b66c2a6db57971019ce2fa7014e1e9d0a1a5e338bc79027254e SHA512 fa9be36122f1c97226c7096657c7b3fd43f23c30c2e7d3ecb0673aa09fc1327f86afe92abf26a078165ee959ee5edcfe77b628c614f92e56cc8ca91e6b612265
 DIST dawn_3_90b.tgz 1334732 BLAKE2B 97f4e747b8f9d2eb60d9c8f0e7358fe549052e36a02127f02363c328775f33ae9fd36afd850ef06b365aaaa9723a541d89d7f2fccb37d1dd30f626054d7939b3 SHA512 5ff0b3572442ad1f435d5f894a0f1637efbc8eb3dae4f67dd456ff220a497cc59fe3bdf773cd38a0690d3689e9cda48f49c408ddab56f31efb9c87447d439fea
-EBUILD dawn-3.90b-r1.ebuild 1072 BLAKE2B cd75223d58f1314132ac2c528862de1aba877a20fe00921c244c46bb43165583ec6f37987f331d5203e40567f8c65e6d9779decbf8d8b9e253e5c2c56b790ef1 SHA512 de9b8dc05426938bed5c65c17856559ab8296cf123ecd9095d89aa1546688c70fac0b1e81d19e676a3ee9f53491749f113170684df4784768e9c342a59d16210
+EBUILD dawn-3.90b-r1.ebuild 1071 BLAKE2B 9b4aedf97dd297864285adbea88e2c1f67f7daabb52d8ffa149b82a5f10f2509dbb9a59f4ece69678f899f2a4be73f68187494ce22a189e2588d28146ca6232f SHA512 4d788eb2323670d98ece9508c6a8bb54dfb899a00962d654da21fb99276b8cee47c98ffcece8d05cffa2f9871c3051526709f5874ccbd53bedfffa7df7caa696
 EBUILD dawn-3.90b.ebuild 1232 BLAKE2B f723d630092e5df1a4d37a5cddbfcea53123a5af42e7dd5e3634e27a1ca08a0677c0152cdac3173734a9c0791d534304c6cd52855b862c87637fd9336846a8fc SHA512 e7e40b06f1a6af969d985f22c79d6ecfa9006ac259a564dec9ec50471eca25dfc9bab6d042f7bc69554b684299a94f613541a97ee6eb88f46e7617a94aba5c74
 MISC metadata.xml 1190 BLAKE2B 1d73439a17d21cf023760353df3691121b9c563264a7df26c17a04b5d1f56977faefcb9d3e289f494d6cffaa0c97bd4b444c463ff93d2b7217e34acf452e7b70 SHA512 e89f54b6c40745ace97ed1aa0acd4e3d7d7f69ef68883e17f43e9425016b7d883fee48e4d229543d99be1c66c274184f49c091ecc71cdf835a2b64e9016611d6
diff --git a/media-gfx/dawn/dawn-3.90b-r1.ebuild b/media-gfx/dawn/dawn-3.90b-r1.ebuild
index eb0d35f516dd..12062962227b 100644
--- a/media-gfx/dawn/dawn-3.90b-r1.ebuild
+++ b/media-gfx/dawn/dawn-3.90b-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://geant4.kek.jp/~tanaka/src/${MY_P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
 
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="doc opengl X"
 
 RDEPEND="dev-lang/tk:*
diff --git a/media-gfx/qosmic/Manifest b/media-gfx/qosmic/Manifest
deleted file mode 100644
index 42baf354852f..000000000000
--- a/media-gfx/qosmic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qosmic-1.5.0.tar.bz2 367993 BLAKE2B 74ade4eaef8a20045179411709318fc531b5d0a9a71ca7ba48a23f22f86e4f42da448d497dea0e20afa581dfb5acae1f830793a2eb2bf682ff6b96fe7eff0506 SHA512 38f73db991587b0607b5b1670578e4b109af3f54b31ada41e7af57c068fd65250aa7285e1765052059e4d4670ad42c4a5da626e475d17110f1517b2d55a9df4d
-EBUILD qosmic-1.5.0.ebuild 575 BLAKE2B 01c2590b2f51545cf6cc2d96f8cf92dd92a66882c8dabe63cf8a3afc391196215bc9a823e75a3c06ac131f6c8f08dfa32baf5d378057b39a5f4d61a40b09ab3b SHA512 61b2ac4ef06d4afaba6ca8a173c39ce009c0361a8054c274ccf8fa3bbb8ef76f77801bfe27f62ae38b3a08f71078212c14fcb32b728f9ebd4738a600f1fed7fb
-MISC metadata.xml 443 BLAKE2B 66bc449dd877cb66046c06484fe3dd13a850d0cad19b138dcd62b71eac2f89d32aec6beebcd0b4b88622b8083897971c9276e69c0fcfb0ccad40d944fc897a44 SHA512 6b52798bb2b080b839a3a6bf4586882f4b4e54c2bc9c5fe8cfbdac91e17e44331b44be0c6c326891b36df94ac50cd3875c74ba478c3bdea65338aa518e7b7307
diff --git a/media-gfx/qosmic/metadata.xml b/media-gfx/qosmic/metadata.xml
deleted file mode 100644
index ce8e31a39cd5..000000000000
--- a/media-gfx/qosmic/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">qosmic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/qosmic/qosmic-1.5.0.ebuild b/media-gfx/qosmic/qosmic-1.5.0.ebuild
deleted file mode 100644
index a9fb06f7b9be..000000000000
--- a/media-gfx/qosmic/qosmic-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit qt4-r2
-
-DESCRIPTION="A cosmic recursive flame fractal editor"
-HOMEPAGE="https://github.com/bitsed/qosmic"
-SRC_URI="https://qosmic.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1.4
-	dev-qt/qtgui:4
-	>=media-gfx/flam3-3.0.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="changes.txt README"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	sed -i -e "/^CONFIG/s/uitools//" ${PN}.pro || die
-}
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index b3b03a15ef74..8e41e70164d4 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -9,5 +9,5 @@ DIST sam2p-0.49.2.tar.gz 562733 BLAKE2B 607264776db1d735ba09d2cebe0b569a2d2f837d
 DIST sam2p-0.49.3.tar.gz 2184864 BLAKE2B 47d3ce6384c344f66e564ea9f70e89e311540c1bbaf640a70cec2830347b3767aa79d525d25c12cfc2aecc61aca676239b99b345fc7e6bb2edfac7c60bd8d674 SHA512 9e9c91a2cd692e49bf73e7c197a0fcbe7df96c685636d1d00456eb8b4b847de3f4848d9bb3d9246340c479c62900ddd4e0a248257aa5e6ec6e16683c5dad54f8
 EBUILD sam2p-0.49.1.ebuild 939 BLAKE2B de9ff08b864a4e9e388ccca38d28f13e2491796f3575c2a5edf187415884cbad7545588045aea254323709c4c2bf55766bf1ca447d76dbcb560bd8b56570f0d2 SHA512 515e7575cda3c19eb95e96f1fdf0e3b641121f8ad8a887e6e5bf20ea6a691b44fdbf081652ff7186a3a2b05a0568c62117aa329ce739cb634796a5e8a686be3d
 EBUILD sam2p-0.49.2.ebuild 926 BLAKE2B 8e9995d93ac3878ca21ce24a5d17ef59fe9bb15c0490eb891b697c345feba4198554931cdafa31e96ef5445f00c2732612093e678355fa9385b529af47f82d46 SHA512 949af7483481b3b2c74ae762ef28d91c7084eba99f3f89482fa07961043d0390688974847824ec7d00be7566681d9131c52094609a2611dbc6c625c1ad8a3540
-EBUILD sam2p-0.49.3.ebuild 993 BLAKE2B bd0e101e462d245df3ae6a5c93d7b07f35246a3659168b752459b59e474c598f6ce3c27223959c394120299acaf9c6df92bde275e7aae6f738d70508b595f738 SHA512 3441b947397675ef63665b0e59531b4a55a770c17f7e4d3f010ba3852989752b77b5112b16d9e4b31213a2a7d28c56efb5dee868844d05198a1c78a4e5666e5d
+EBUILD sam2p-0.49.3.ebuild 1004 BLAKE2B d4bb6392fcfd2816c9a3943fb419997b1b691edd76db05027916cb1fa3b2f9bf1eba488aef6cde01eba3943de3254bf8db86096dfbc56ec5f8781aababebd9ee SHA512 21f474cd209f851d935db6d6c8e6b18764d264f7918319ddf87054922fcf959d0c4d1bd293ef69fe26c071867c89f8f6326aa14525d9870ff532bc67e907d73d
 MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
diff --git a/media-gfx/sam2p/sam2p-0.49.3.ebuild b/media-gfx/sam2p/sam2p-0.49.3.ebuild
index c6eb44f5fa9b..cc4e1cdb5b0b 100644
--- a/media-gfx/sam2p/sam2p-0.49.3.ebuild
+++ b/media-gfx/sam2p/sam2p-0.49.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
 IUSE="examples gif"
 
 DEPEND="dev-lang/perl"
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 28f18d28aaef..5ea5e01489b7 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -14,4 +14,4 @@ DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 EBUILD splashutils-1.5.4.4-r7.ebuild 6878 BLAKE2B 6f73a0e3a49677b336b16188f45b7d6592e08d446ef9d2de2969b7aeea8367695b1b0fe0d3b919f903a5753d60fa0cf9cea020e11614d700b422dd5321cf3610 SHA512 1b1e328e9b9b06b53d5e676c8dd79d339095194345f94fd135297bccde2afa5044c2a8c16b4ebdef523dce52b8a9075dceabdecc70765312b8baf959c9dd7713
 EBUILD splashutils-1.5.4.4-r8.ebuild 6970 BLAKE2B faa78f97cf0401763e0170397be44df60aca4e00d03d93b67c5075bdcea41d87ae241e5dd032727d96f753a8fc2aba23129c090ab0b19afff845eda65d4f93b1 SHA512 cb4a35904fce48ed971fda59a1a38c64d27684291f6383935dce56532a2b2be0bda5d690e537903f96683293512947b43d21e678fbd9a10f127b27308310eb37
-MISC metadata.xml 508 BLAKE2B 821ba866d8e2913004e3eddafcedfb1663e01ca500b9335250863829ad3a2c4351ac1796ecfb78d6fa005f1349e6e01b725b41154444e597ba2e4c6792ba3df4 SHA512 6ad59793cd6d2c3542f447cf7d9557740758d276405c48a0cedd9c8258f8f7b88d110f8339c91ab57c1140c3a4fd96a7fb02ebebd84613f7b18c672b9bc6f194
+MISC metadata.xml 338 BLAKE2B b1acfec719af910d8c2be2d5224c15c240b2f85ee046e4eb8ebcdd17cfe40c6699d35cf6b2bc68fc73d0bc8ed03643cacd7431409161cfad6a32e551c6ad70ba SHA512 589b371956889ba3388b3c734b51b36605ca0c5e9ba2b1507126cfd805bdc9cd02756c1d8d8b9f10cbffbacecc9e6bd41afc9e8ff505d27612c4d1158fc7cb72
diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml
index 384553ab7506..c3a139b7fba0 100644
--- a/media-gfx/splashutils/metadata.xml
+++ b/media-gfx/splashutils/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>asaf.gery@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<use>
 		<flag name="fbcondecor">
 		Support for the fbcondecor kernel patch.
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e0a148dc7e3f..de5b93e741ab 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 7c236fafd823..c49082e530f8 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -2,8 +2,10 @@ DIST Image-ExifTool-10.79.tar.gz 4345706 BLAKE2B 692703433c2bb51c74d81c4f2930eed
 DIST Image-ExifTool-10.87.tar.gz 4377842 BLAKE2B 49d94cb6389166562d653a2f8855e6227a357cd9e430b39cebda858a71a9ea1ce2f82a09d80046c65e1cf4cffa6fbfddec53fb4c2ae2f98d2d3a31c6ad920166 SHA512 bf10e30675fc326699c0931ad2d4283b2bcb65bd911d0157a8c5ff608e5835109580f6bf7d7d43a7b76ffb4b7d12b432d9eed17a9a845e2da07d8600a3189ed1
 DIST Image-ExifTool-10.88.tar.gz 4379772 BLAKE2B d0d4c2fef52e314ef96d7bb117a5221f571004f3e1928db4f04ef1f43d9956915dc7b78550bb5a49508961de985600f728fdb4529bd0e5870b7369a4a4122628 SHA512 85ed7cf1564f92145673b08a6759c83576b40cfc5ec8f723fdbbf72375d0c9779fd90178db719664126e2cbb4b60208e1f8de9d3b94e814f53824d68ebb119dd
 DIST Image-ExifTool-10.89.tar.gz 4381960 BLAKE2B f64d2508b3ba8b428395e60331494880c31751dde418e198d0b68e5337939c8c8b30a8e14b494a35453d38901472fbba2d44bc35f0df718530663bf62c20c8cd SHA512 eabb79cbfd323154550816d2ed21ebfd69d6080352ddec3844435ce269a78e5816a3e85a4e05f64fbd19b925f490a7a8df8ffeac46481369b7094184eba06e7e
+DIST Image-ExifTool-10.90.tar.gz 4382245 BLAKE2B 94b699cf7bf793dd92ee95eb28b0296ed985370fef8be3ce4d5007d14a3aa641f38ddea4ade6369a7486c283b5f048de92f6b49ae8a5b67e32fe2dd3fa55dc0d SHA512 4b0eeb1a92dfa19414a8fe52b0741ee5efe09ca31a69ce8e542e2a5866bef01001d98e3577557906db43a2a51cb0b497edf4ad9ac7e93732d9f4d2ab00a37a9b
 EBUILD exiftool-10.79.ebuild 532 BLAKE2B 0160ae82e2faeb67b3d64ba8003825f0ff37b354d7a9472479a942b910c002b3b8444d614cd1e2c158d6967baca3e7670b7678e02c56b62da3087b03452ca826 SHA512 9035beb7ddca4eddc51df4dd2e651a52cc2c15cacaf663614ffc0589d262dffc75d46f8d59ed385f40560c4f2aaa8246d7d5b6c418e90cc1bb031e53dfaf0d62
 EBUILD exiftool-10.87.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-10.88.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 EBUILD exiftool-10.89.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
+EBUILD exiftool-10.90.ebuild 536 BLAKE2B 8af36442ae3d7feb84e9020313981ea6f4594afe77dc3a0450b553e47cff66dbaa4f2a01ee1395fe4757c774c6cda7d8b96dd2ae8bf5277aa858840160e39961 SHA512 94669122bdd68961ba08decc6a7911403a9f5bd857b95a6a7b8cef171db592ceabf53648c7c0beacb0cadf677d77784c96fbd6fb3549c7513d00b01a7f167ca7
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-10.90.ebuild b/media-libs/exiftool/exiftool-10.90.ebuild
new file mode 100644
index 000000000000..ec856d3619aa
--- /dev/null
+++ b/media-libs/exiftool/exiftool-10.90.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 496ef80a9141..bf25985e6dd6 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -7,7 +7,7 @@ DIST fontconfig-2.12.4.tar.bz2 1613580 BLAKE2B 9d6b0d5d7bc61cd3dbab2ad769df3aa33
 DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06
 DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc
 EBUILD fontconfig-2.12.4.ebuild 4930 BLAKE2B 40ea1f8710e43736d7da02b1a30df092818cc5ac8d513ec2f09958d0ed6cad7a1446b143279779643229e473b1fadc206387820c8b31755974b5f1d76594ed95 SHA512 46110903d927e176a8346527503431ca66b4a1b08aa3a441e0621ea9c7eec5429b21191c18156c8782013cc0e8dfe7a0ba55acd1d6c9dd92ddee23fe3562d11d
-EBUILD fontconfig-2.12.6.ebuild 4996 BLAKE2B 5ccfc1a869de0657190d80baadc84c78a7caffa0f99309bf2107958ecf81eab480898a26344b8e5c8eb8cf8c6aff441a50ddcf7366f9d61f609cad6dca8c2522 SHA512 05687a9f99ddbf731079d9a04108817a61c8db5c6e5d7acb527994669358f84395c39b768ed7620cab725a62c47d7ef129c912d1a72c926b2afc0afc13aa3fbf
+EBUILD fontconfig-2.12.6.ebuild 4995 BLAKE2B d7843faaa1b48b4db2138ec08fe53f797d3ba02c05b4eb1c6b91cf261edee105e94ea9bc200f5b08f9b08fced53d9bef93719ed529f7aff53fe7c4e589211190 SHA512 a15943efca6a4a88cae289702f6bc29c8fc603473c3a7565f8bbab64260d5c041918f2f1a70ee531f312d2900278da33b7b1ad4f5c0a7bd5347877e2ca342961
 EBUILD fontconfig-2.13.0-r2.ebuild 4947 BLAKE2B 62b92c0841744a2528f30473d8afcbc2d355e9a3ff2e2bd2a17cd2400636d7e8bee386d436076f69ba308df873e2d8ac44b61fd4c335d6d9966ce9f6b8eb7f09 SHA512 8b92ab41698761dc735771dcdfe2d802f6221c374da04fe39019a84882eeaf7814a351b5e923dae381896fb64ed6dc8ca3180a8f4ca1d394c24a1b10a43b534f
 EBUILD fontconfig-2.13.0.ebuild 4886 BLAKE2B 53afd9c7099bbca51d0b247b7af20ef985c373fe3a4217a58b22b1c27a26e111d171e2907759fb4f7101e319370cea32ab4ee24ed0c99851ed6a1089fffa7331 SHA512 8cddd384732d2115c4476f2d40fd6de6bc4616120fd484adb78e7d77aaaa9927e63b3cbac5e9364bc33870137a11e7c5e1f3ecb4b095903504d3db8757de8fe9
 MISC metadata.xml 500 BLAKE2B 5326535fbf21d56868f15d3e5cda11bddba722762423b8831da99f9ff31bee71ed6d4e5ec62af46a7981c233c9d516068257413cb473c02657d3543619692b24 SHA512 bfc956b5196face33a60fa495b7948cd8f01802f23efd02da9da41146443b76f3d01ef5192a7541dd65e107df5e1935f73f5bfdb939c14fdde599919c7fde190
diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 2b836b5e1ae4..2ead8d98ff7b 100644
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 244fdb097e9c..1879105c400d 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,5 +1,5 @@
 DIST libvorbis-1.3.5.tar.xz 1193144 BLAKE2B 8f1b7dc9e25147fdb6304e2630a0f90a8766338b4566e9ad2f288f8e6cbcfa98b9d471dbd33e98882711319c74d5ebe78728b4c7376e07b2ab5b08a3b67c74a1 SHA512 f18f32edc43f65fea2dd4133e2828a0ced9e5b0797c4569bd26989fc1409ad599359e7c796bffc082ad36189f9722c7b38837384cea66d217beac8b425299ef8
 DIST libvorbis-1.3.6.tar.xz 1195388 BLAKE2B 9fc1dd125fdecb95687ea159b75cd66eed21329ec0795a3050e52e6cc58e1aac7b084ca25c4e52ca6f251ff474f6d71a716c0fbb2367beda8eb6a51a8fa9049a SHA512 a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
 EBUILD libvorbis-1.3.5.ebuild 1142 BLAKE2B 2740755716c6975599af41c8038cf11eebe2d83e1ebe3733acecea604849cf538a68728fe21efd85b1c690e62c0c003f51840b2a500e34c5beb01e1baa9335bd SHA512 e3b701b9ca57bb7600791721b06af1586614416011ba8bcefd55f2b556eda41e936ab8991f904f98190e9972dbd1bf897a20243dada0e0fb341bb9c7d205ba40
-EBUILD libvorbis-1.3.6.ebuild 1151 BLAKE2B 218f38dd9fb2ef1d1dfeedfe31329a84783b862c4f0fdd97a523e7807d6ebfab1fccab35925818b83c1c494125f23efd3ee844f9e5e576b5bfe5283e70cd8995 SHA512 ae33ddbdae75dc16c970e711a4d0f446c33ca24826109347d3fdf9b6535040b452e2b352b9db0dadbd6cc36a9f438f1861ec470474a9f952b3251453626179ad
+EBUILD libvorbis-1.3.6.ebuild 1146 BLAKE2B 93e0b23ce5df78b06ba9523dc23138f63958e1d5626362a0ba77a8d4a46ea98cac7dc74e20dbd4cf1950df9777a7e5773c55298cb6d6d1556de10b1d33be9f5a SHA512 0ff3afce475cee2022e2f2e28c2455c59d54e469d615328110e6f36d9053f2966164e642a8a3dcd513503cb953c48441210f9a528f0a908408ccaa3ae08fd648
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 92e37324f12b..022b249dfddf 100644
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index cc6e88bf530f..c314f4fdd91a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,7 +7,7 @@ DIST mesa-18.0.0.tar.xz 11056544 BLAKE2B 467c100bcbc0a60e3868e718331192255fd1639
 EBUILD mesa-17.1.10.ebuild 13463 BLAKE2B 1770254368c5f58be3a6b7e24eebc083cfece5af94fe054739eb5985a5158c56633abafa9e8d9298b1a559618ada21a80341c38a8bea03d787f5270e6a9e5124 SHA512 ea34ae58ab59208f26398004905264229b2ae4d92efb2a9c779bd50b223873738d904df624a1ab652b55ac0a4b1156f36421cee2605f1910372b661d6e9708ca
 EBUILD mesa-17.2.8.ebuild 15022 BLAKE2B 8de43727d00f3ffb6136c59f42ee268a8f2b20cfa6a8784efda04e37ad606510f0f3b32e00ae24533f070f4a1d7a9cbc0a3986b7b1c646d8ccec8b38fc7fa50a SHA512 518068373eddd00746a67a832592cc61cd6faa24f79475722bf6edde13f2ff7f17a292294162985064feeb26ada07801f44385f35b209a725a41ee315980b94c
 EBUILD mesa-17.3.7.ebuild 14916 BLAKE2B 6a0e29ec0ca3a10713c58d28c8c8b44c55ae254254dae1ee0e9d2b4495367af2fc464cc1e69d7e1a1c8596deb92d6c3331e0c0b107896155b6d456a2d7a0514e SHA512 fd75796a17acf72ddbe5c82a21eeb9a2c8ee301296ad0787aa0a56b857a6d7d02de4a6acb8cee20a597cc1fb8c7b87e861905f8f5549ef9f18b70d36664f218f
-EBUILD mesa-17.3.8.ebuild 14915 BLAKE2B 469393c5781be76e322ccf8b86ac9239bafcbe8c70715fb001ca90b608002c2820d322d46311c767937c5cbad7204b6d21064d001e37985322a7d0ac1d023693 SHA512 7107be3f71427fee5e149d69af97986f6367626cad662558fedb2e6bbbe556c35f677fb7f1d4ddec86c9bd7c823c07c9071285591329e9ca3cf1d8689021e015
+EBUILD mesa-17.3.8.ebuild 14911 BLAKE2B 5322b18095c01105a0d0820b41431562dd148d1befdb097285e3a1c4a5ebe09af7624da054bd6aa7f9311b259fd50cb8a849a27d329e49adf9c22f58a11c9c21 SHA512 d6a4c164d44b8281f40f24cdebd8ed4fcb8cd9b9121fd5f6634228d4559d576d95321db2b32f885041dff3b16a6eebb88e5343a5b59eb429286dcb837d44de19
 EBUILD mesa-18.0.0.ebuild 14959 BLAKE2B 568dc3b028ba4ff14aee9f01d70c176fa2ed87421a1810caf6cd89c12e48a53d418b9db1b6b38c9b3094e611b7a2ec32a360a92aef3e579b72fab59edef5187c SHA512 c2326f1f714aad3888a901f40dd11028782a3c1cbc6d0a6a2172d542b3488a8da7b80240812284e2ea79b5cbb07489e7ac718106f2943e3016b36311b1897980
 EBUILD mesa-9999.ebuild 14997 BLAKE2B 16608004e2e4b89869537586d93b392b64f512b1408ec5b4837181dd42c722da6f7d85d9a7b05adfd1ea529ca7311b8484fa93711033878981e76479ff1dc4d2 SHA512 8e0faa63d96b23bb1d513792d353de24e58d584980a7d023b8ce947f4d02864ec225067eb0146b2ce53d0e2904f18583f4ed3668c8052a955616eafe540dbe6a
 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-17.3.8.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild
index 04c07eaa82d0..0f839a82366f 100644
--- a/media-libs/mesa/mesa-17.3.8.ebuild
+++ b/media-libs/mesa/mesa-17.3.8.ebuild
@@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2fa52f2093e0..ae8651cf6eaa 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index cf2d45c76134..ac6b7d0f879c 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-inputstream-adaptive-1.0.6.tar.gz 556505 BLAKE2B 0b093850cf61ed75627d024f28fca93a6b0426decd3d99b94a60f9a86f611d59a6b2a7bee7e5db52095d99d0a0d092d60c3051a77294cb5a47e8cdcd13359a61 SHA512 10accc94d3cb68b0cf89d4703ed05b4c0b1fbd02415b6721c372933ba629eb13c034d4336a9c8e5ffb4c8150a798b29c184f0d475069cad82adbd6e63d63b712
 DIST kodi-inputstream-adaptive-2.0.19.tar.gz 881342 BLAKE2B afa1341e9f45d5b97338d21359e4527c3a19ac8ca30066ea2c83ea0eb8e2a34a72bc179cfc222612579ee1b1be12bda52325b3f32c85b53c7a9cefd8461d238c SHA512 0453998749df691071bd54e22eda8042f15f0ab1a11b04a260c7005048b533b51b6c82311bcb364fb10e68816512610a08db5331f974a042bb8967939d759d99
+DIST kodi-inputstream-adaptive-2.0.20.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
 EBUILD kodi-inputstream-adaptive-1.0.6-r1.ebuild 712 BLAKE2B 98e7767a0fb45a23133bd6f19fafd54db7a6523785f3e29a8846ee1cab2e777e32242aba6367007aa6832d32753421d605e2e48f1f3d995911383197a034a138 SHA512 c06736459fbc7e161837bdb0a102c25640c2f33283394b3dc55dfbf0441e039ae57287e40282be3aee4806e06a73426223c0b3fc0ad32a83016d244d56fa358d
-EBUILD kodi-inputstream-adaptive-2.0.19.ebuild 799 BLAKE2B 4ed20a891cd07e9252e6ae823a62f97e7391ad88867329950d90387e8bd8c88f98b9e06fe96d3f14331e10bf24f8c8aa5d6386589e6c21a65103dbdf68467f87 SHA512 5f8cf4730a4043ae95e0512ec87af5ba46c64bbe5d31e62ea24d0ddc505e449c0af69feaae1ef4bf15ac011ed65e5e499da8b9cb92d067d58b5eac2bdd04e312
+EBUILD kodi-inputstream-adaptive-2.0.19.ebuild 799 BLAKE2B 3698cc34e454d7ad3c0b817a1210835bdb8acb05a6bfe90800a00b79bec02934c5584a4261b48d29b2071c20a5a3676787807c6854fe0a05f49edb539ea87a56 SHA512 36b57bbffead2f2bfc9c7e212423224e532f7f7008a4ae7c661de49caf5417c1ddabdb79ef9735a4a068ecafb378858c00119253d3b9090faf86c3f3ebf88f39
+EBUILD kodi-inputstream-adaptive-2.0.20.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
 EBUILD kodi-inputstream-adaptive-9999.ebuild 730 BLAKE2B 0e54a9f7e9ad794728cb8ab514a1c4d6aaec025f40ca754fe9fefa4080e60b89876c9c414b179a4fc6eeb9fbc59fc1532ff30ca8b32353e16306538e89ea39f1 SHA512 ce1ae0b52332fde23c754b5e5ab8395357adb410f700c7753919fbdec50eb40d89cf4595947bc1729a793a06d2023266fda9adfbf7fe4f7bcd0df44a42ac6c50
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild
index 7a48b4c57ae4..f51e2239189e 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.19.ebuild
@@ -18,7 +18,7 @@ case ${PV} in
 *)
 	KEYWORDS="~amd64 ~x86"
 	GIT_COMMIT="9af21218a87572bd4ab8d8d660c11f6295144f97"
-	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz-${GIT_COMMIT} -> ${P}.tar.gz"
+	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/${GIT_COMMIT} -> ${P}.tar.gz"
 	S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
 	;;
 esac
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.20.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.20.ebuild
new file mode 100644
index 000000000000..962f5efbfe14
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	GIT_COMMIT="c51b9a9b58a645f820883e6d99982277fc58aac5"
+	SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/${GIT_COMMIT} -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a0d7b83374a9..89a2876a36e7 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/qt-recordmydesktop/Manifest b/media-video/qt-recordmydesktop/Manifest
deleted file mode 100644
index 313baba89e1a..000000000000
--- a/media-video/qt-recordmydesktop/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX qt-recordmydesktop-0.3.8-check-for-jack.patch 1081 BLAKE2B c2e07cdfe6225a4f2afdd7980d50d997cd684fc72b34bf8d72a4f4cfa175e0771b4a802ba277f2d6fb8ba4c9b1166eecc62c7291245a9c2368eb888e92d11db0 SHA512 5ed03448afbb3e9c0f7c038f92342df0b727abfcb32c073a555322f3afe7d355b34a72383653bbdcf75cc2f71017caaca98b65c29da88356cb5b5d8b62c91ba2
-AUX qt-recordmydesktop-0.3.8-desktopfile.patch 461 BLAKE2B 86bf4f997c58be3ddde6ce60272b0e2da95a6deb49b42b52b08d8650f6b03fed683281302cd4116cdabaf996600e754426d296a82c7f040978aebc602b639d90 SHA512 5bac70def84c8dec555c712b1e936e638ae5e54023e7857fa2bfcbf9ea1f5eae75276ee3297c7ed8fa4c95560042b6af702f732cc10ba5d8a643bf27f8d5bd6d
-AUX qt-recordmydesktop-0.3.8-pyqt4.patch 452 BLAKE2B 39687f1d05bdc5ee13349e490a9dcba2af4043b939efa128b2834bc547aee9cb0d6a436d3181535a11a12d62b60723df38e2765d08b315b912930da151e5c5af SHA512 61dd69db21302667980e271cea2fe36add27ae8728b4d1b126ac1b1a883301238179735e2299f5c20b450099b1dc865152eaa40541642d1204f33fc8ed57b011
-DIST qt-recordmydesktop-0.3.8.tar.gz 185528 BLAKE2B 366bb84f6ffa39db33c04ebf7e59fe5e8b04099e8a8a5c704ef4dfc16f2f878292614b301ce1c7a3cae4d532d0696cf3f7474e15f762a20da220c951737a687b SHA512 bdbdfc898e7a463547701b22af94e8b86c48037e3d644afcb0465001922c9cf9e722d0b929868237bd2800edd14df78d6eed93303cdcd19d98ec864934488fe5
-EBUILD qt-recordmydesktop-0.3.8-r3.ebuild 1220 BLAKE2B 38a98f55c89df86dfc465320308291cedc59ee22e35fb6678431669a8c91420d77df7d608e0b2810f9f8f5f1a21d418925485a154e4737bfaf5162249d16633f SHA512 8cd2bb373d35377ba7086b456aeab8a564c9ac0feab8d48d5c6eda75960c31e6305b6f04c9f4ce7ad086ebc6f4f09b89c8c1e6c491e8122e2c6fad2e09ed777b
-MISC metadata.xml 452 BLAKE2B b3aae69d6b207ebae318e652f87bf139d12ffd92cf95d6da161e8d3a2ef7eb3b5b93ef61dcc806800731ecf298f4a617acdbd6b881719ec484489eee52aec86a SHA512 931f7bd1ecd2aeb53a02682096eb623bcc5360ed0dc1ea3de65209fc9542989c4446094d7f8f8741e2e983456df270a081d61c5e1fc816f173726f66c96cfa38
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch
deleted file mode 100644
index d27db3abbcf8..000000000000
--- a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-check-for-jack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/rmdPrefsWidget.py	2008-11-23 16:09:14.000000000 +0100
-+++ b/src/rmdPrefsWidget.py	2010-05-24 16:23:30.255865721 +0200
-@@ -302,9 +302,29 @@
-     def remPort(self,lwi):
-         self.jack_lsp_listSave.takeItem(self.jack_lsp_listSave.row(lwi))
- 
-+    def which(self,program):
-+        import os
-+        def is_exe(fpath):
-+            return os.path.exists(fpath) and os.access(fpath, os.X_OK)
-+
-+        fpath, fname = os.path.split(program)
-+        if fpath:
-+            if is_exe(program):
-+                return program
-+        else:
-+            for path in os.environ["PATH"].split(os.pathsep):
-+                exe_file = os.path.join(path, program)
-+                if is_exe(exe_file):
-+                    return exe_file
-+
-+        return None
-+
-     def __runJackLSP__(self,button=None):
-         self.ports=[]
-         failed=0
-+        if self.which('jack_lsp') == None:
-+            self.jack_button.setEnabled(False)
-+            return
-         (stdin,stdout,stderr)=os.popen3(['jack_lsp'],'t')
-         ports=stdout.readlines()
-         stdin.close()
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch
deleted file mode 100644
index 1ea843a8733a..000000000000
--- a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-desktopfile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fixes errors reported by desktop-file-validate.
-
---- a/src/qt-recordmydesktop.desktop
-+++ b/src/qt-recordmydesktop.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=qt-recordMyDesktop
- Comment=Frontend for recordMyDesktop
- Comment[fr]=Interface pour recordmydesktop
- Exec=qt-recordMyDesktop
- Terminal=false
- Type=Application
--Icon=qt-recordmydesktop.png
-+Icon=qt-recordmydesktop
- Categories=AudioVideo;Recorder;
- StartupNotify=false
diff --git a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch b/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
deleted file mode 100644
index 9b2368cfd660..000000000000
--- a/media-video/qt-recordmydesktop/files/qt-recordmydesktop-0.3.8-pyqt4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: qt-recordmydesktop-0.3.8/configure.ac
-===================================================================
---- qt-recordmydesktop-0.3.8.orig/configure.ac
-+++ qt-recordmydesktop-0.3.8/configure.ac
-@@ -50,8 +50,7 @@ fi
- b=$(echo "$PYQT4_VERSION" | awk 'BEGIN{ FS="." } { print $1 "\n" $2 "\n" $3 }')
- c=($b)
- 
--
--export PYQT4_MAJOR=${c[[0]]}
-+export PYQT4_MAJOR=${c[[0]]/snapshot-/}
- export PYQT4_MINOR=${c[[1]]}
- 
- if test $PYQT4_MAJOR != 4; then
diff --git a/media-video/qt-recordmydesktop/metadata.xml b/media-video/qt-recordmydesktop/metadata.xml
deleted file mode 100644
index 5fe329f2068f..000000000000
--- a/media-video/qt-recordmydesktop/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">recordmydesktop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild b/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild
deleted file mode 100644
index 765398caddc5..000000000000
--- a/media-video/qt-recordmydesktop/qt-recordmydesktop-0.3.8-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1
-
-DESCRIPTION="Qt4 interface for RecordMyDesktop"
-HOMEPAGE="http://recordmydesktop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/recordmydesktop/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Test is buggy : bug #186752
-# Tries to run intl-toolupdate without it being substituted from
-# configure, make test tries run make check in flumotion/test what
-# makes me think that this file has been copied from flumotion without
-# much care...
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/PyQt4-4.1[X,${PYTHON_USEDEP}]
-	>=media-video/recordmydesktop-0.3.8
-	x11-apps/xwininfo
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-PATCHES=(
-	"${FILESDIR}/${P}-check-for-jack.patch"
-	"${FILESDIR}/${P}-desktopfile.patch"
-	"${FILESDIR}/${P}-pyqt4.patch"
-)
-
-src_prepare() {
-	default
-
-	# these deps are required by PyQt4, not this package
-	sed -e '/^PKG_CHECK_MODULES/d' -i configure.ac || die "sed failed"
-	eautoreconf
-
-	python_fix_shebang src/qt-recordMyDesktop.in
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f4c681c79625..16139f3c7344 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a2553f1e1280..a01a4cb82d0c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2018 20:08:22 +0000
+Sat, 07 Apr 2018 11:38:22 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 5a254b565d62..0d9778ce12fd 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 419802 BLAKE2B 77b61430b97be606d07e770dcefecad6df694cb9d174d02e411d0c9124496cc8f3c082d220e88b305fb15b10d7c63b688c68e4484d9efe6cf97b41aabe095755 SHA512 3f233f14b1531babe34f57d6f927c008a3406b144de3e74532b3bf23c806220ffc43906d40c476f43e773cfbdabd98ea035b95415e8a23d7ad3ed93384c13bf7
-TIMESTAMP 2018-04-05T20:08:26Z
+TIMESTAMP 2018-04-07T11:38:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrGgjpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrIrbJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB3Zg/8D45b3fgD07PCC6C+KMgpBdhjBaqhe9sV4rEjBQKsRKeLo5mA8P0tPn+b
-43GRG5EKerafRtvLSB0lflhiA1GEQ4jmx9w++/j9MmMYVAuz0VqAd95b2lU99aVe
-wE/wVauON3pB0DvJQwtKdj0ukIWS+3B1EfnAMHUOsN4QVBSFdEZAgfEdhe5wuuPT
-vi+ZwyD/Ef5ogWOXf2fWOlGiun/qhSnaKDjellBe7NHWSNqDoSjs98FJA6Z9rWdI
-+C1O84YGZfnD3c6mKoy9ibYsqI8Ghvz9KZlX0rG2q2KrtazUpkRkJb2kBwXOWAIg
-AvxgWvj6MHwlhCZTtt9SQVR+Kn1wnmIsLVBi/17yXvxUS2OqbtLRMgkdI+c3ZYoC
-06FETlMxNwJ1LdZYeuKlan+OhG1a8w/EpT6mVX5zESXQP7LAw1pDdJ3NKHeoK/qq
-mz/jAPyMRpjJHB93OV5koSG3UQD6++m25r6DK5wWQCDklCsaVBnt3vz4Ex+iHhGb
-0eCjLp9kq9VtP4Vt5JecUmQh7rtBZEi7I2FHFwjhssW2xJj6qUoDV9I4zFQzGGp4
-OtVvL96XQUEJl7yd/mn8J5oDvgwwIglz+YCsKPRqDo8pLLhVw9p+MiUiGl+1xKXd
-VcynkW21ZjKPtv15ZIdUJgslIxKRNYv96k1TaAFk5eYTyT8Qp4E=
-=z0ML
+klDxaw/8Drfbfj0hfEitCnKxUG4s7ZsusS76lSRthsQkw6WlGKhiuO0O60MAS0pa
+ne5YXBBKp8CY9WMtTIPwUK9uFoVzvGvBGP8HZmEYQkKRvSnvfyBudQjrbWp0k3Cs
+2TLcIrTS1slz6CGWDG8e/qwW3+7TfsTCegwixEQ90C8MOqWQkdC2zhkP2uN321gt
+VRs89bMJuxgJTtbVB23Ttkj2mvmbeqPsStvzXF0Yqb0617pBkIgQhZxzsRnJXYhs
+yBFH46JqLacgah3caCyZqPYtu7qefBdIsCo5PbGUlHZWzMrhrF/CVvRcazOUNYBy
+lOD2lpzR9QuX7gMvffiDg16rHxtsHXb0e8cfl1oDJ1JIRpgwi39oVPlIFSIOqTjC
+hDuuHUrqRIwbiuJtLYL034SzXvK7VnqpqPQpH5PoB7iqG/i+FHhyw7WiJg94doAi
+qF48/+QIOuQzesuL89zNwb6FEkP4rPkNyhd0+gZAKETb/mhUoHkNC0OdeUWQTT70
+dtaiH4HlOvlyOxm7Y5Mae2P5mHXWSuKNWrznahnGnQDjeSwpoHLlZLAOUfdy7Wy9
+Gn4yHzSRMUX31T8c8UlBDqzIwaPP2npukLAhW/fD8+BsHWofDMqA18sGLnw5XKSD
++5nROyVpqxqKf44RNM/KNKdQCamasvsX7SMfuhrdkBHYoJ79bmo=
+=4WEz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b635badf5e6a..a01a4cb82d0c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2018 20:08:23 +0000
+Sat, 07 Apr 2018 11:38:22 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a97a89c5be8c..566b4d30a1f6 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index c7335d3ed3c7..83ca100abd2e 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4 b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
index 42930fb0167d..4f5f761ede66 100644
--- a/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
+++ b/metadata/md5-cache/app-accessibility/speech-tools-2.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Speech tools for Festival Text to Speech engine
 EAPI=5
 HOMEPAGE=http://www.cstr.ed.ac.uk/projects/speech_tools/
 IUSE=nas X
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
 LICENSE=FESTIVAL HPND BSD rc regexp-UofT
 RDEPEND=nas? ( media-libs/nas ) X? ( x11-libs/libX11 x11-libs/libXt ) >=media-libs/alsa-lib-1.0.20-r1 !<app-accessibility/festival-1.96_beta !sys-power/powerman >=sys-libs/ncurses-5.6-r2:0=
 SLOT=0
 SRC_URI=http://www.festvox.org/packed/festival/2.1/speech_tools-2.1-release.tar.gz https://dev.gentoo.org/~neurogeek/speech-tools/speech_tools-2.1-r3-patches.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56174930652fa55cc3d5a74420c1180a
+_md5_=5425419b58789ac0d44fd94697340406
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ef17948c8cff..8a4f98d08838 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/filebeat-6.1.1 b/metadata/md5-cache/app-admin/filebeat-6.1.1
index c1a517b4fdae..4996cf47fcce 100644
--- a/metadata/md5-cache/app-admin/filebeat-6.1.1
+++ b/metadata/md5-cache/app-admin/filebeat-6.1.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/go-1.9.2
 DESCRIPTION=Lightweight log shipper for Logstash and Elasticsearch
 EAPI=6
 HOMEPAGE=https://www.elastic.co/products/beats
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/filebeat-bin
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elastic/beats/archive/v6.1.1.tar.gz -> filebeat-6.1.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9f13e8fd14dad9d4da6d7a020cd52ef5
+_md5_=eb8dbd909b57e1d34864f105b002c1b8
diff --git a/metadata/md5-cache/app-admin/stow-2.2.2-r1 b/metadata/md5-cache/app-admin/stow-2.2.2-r1
index d62b81b4006d..40df289a4814 100644
--- a/metadata/md5-cache/app-admin/stow-2.2.2-r1
+++ b/metadata/md5-cache/app-admin/stow-2.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GNU Stow is a symlink farm manager
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/stow/
 IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.2.2.tar.gz
 _eclasses_=perl-functions	01e8c68d5a528bbcda4d3c60205983df
-_md5_=e52a6c03096c2d751929eb8d9012461e
+_md5_=2f5f8e9b73ffaf1f90dbe8e9450f9005
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.13.2 b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
index 3c374ffe3ddb..5246901cc2b4 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.13.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7
-KEYWORDS=amd64 ia64 sparc x86
+KEYWORDS=amd64 hppa ia64 sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
 REQUIRED_USE=python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4f402cbb2eca97ced36f11eadc236632
+_md5_=4282c07c74779ac6fe90334300537623
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.14.1 b/metadata/md5-cache/app-admin/syslog-ng-3.14.1
index 04932e25934c..ef06c880c500 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.14.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.14.1
@@ -4,7 +4,7 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=6
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
 IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=amqp? ( >=net-libs/rabbitmq-c-0.8.0 ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0 ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/ivykis-0.36.1 >=dev-libs/libpcre-6.1 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) !dev-libs/eventlog >=dev-libs/glib-2.10.1:2
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.14.1/syslog-ng-3.14.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=93c0cfafc497373ecd07299e17497a0c
+_md5_=30d894291eb0f9359549b0f4c50d2d53
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 9d597e9b479f..2372c97b2e4a 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/lzop-1.04 b/metadata/md5-cache/app-arch/lzop-1.04
index dfd7abdc2b6e..03062c510fdb 100644
--- a/metadata/md5-cache/app-arch/lzop-1.04
+++ b/metadata/md5-cache/app-arch/lzop-1.04
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/lzo-2
 DESCRIPTION=Utility for fast (even real-time) compression/decompression
 EAPI=6
 HOMEPAGE=http://www.lzop.org/
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-2
 SLOT=0
 SRC_URI=http://www.lzop.org/download/lzop-1.04.tar.gz
-_md5_=ec8aedc6ea69bc549d3aa45e06c23915
+_md5_=5e383f03f3c6ebda5464fde208b70600
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 82de8e70b0b9..f82d3067923f 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1 b/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
deleted file mode 100644
index ee1d1d5613c0..000000000000
--- a/metadata/md5-cache/app-cdr/xbiso-0.6.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/ftplib
-DESCRIPTION=Xbox xdvdfs ISO extraction utility
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/xbiso/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=net-libs/ftplib
-SLOT=0
-SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd4518c2c49e7a59949d5d0300ab9096
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ac97e0dfc372..e712ec86bf26 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0 b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
index d0f61937ce6a..59458d4c3fa4 100644
--- a/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
+++ b/metadata/md5-cache/app-crypt/libu2f-server-1.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Yubico Universal 2nd Factor (U2F) server C Library
 EAPI=6
 HOMEPAGE=https://developers.yubico.com/libu2f-server/
 IUSE=libressl static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/hidapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/json-c:=[abi_x86_32(-)?,abi_x86_64(-)?,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/0.1
 SRC_URI=https://developers.yubico.com/libu2f-server/Releases/libu2f-server-1.1.0.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ede98ebb7b0d236722b811f8c5632429
+_md5_=fa709e5032ac315264d9a345605ddd7a
diff --git a/metadata/md5-cache/app-crypt/paperkey-1.5 b/metadata/md5-cache/app-crypt/paperkey-1.5
index d92e9d35d43a..977bfebc8893 100644
--- a/metadata/md5-cache/app-crypt/paperkey-1.5
+++ b/metadata/md5-cache/app-crypt/paperkey-1.5
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=OpenPGP key archiver
 EAPI=6
 HOMEPAGE=http://www.jabberwocky.com/software/paperkey/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.jabberwocky.com/software/paperkey/paperkey-1.5.tar.gz
-_md5_=b7afdf51b9b1dad711f34d80c66c2954
+_md5_=3d8648cba438ce57145d585d31d5c8c9
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 706da9f453cc..fa69a0e560ca 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/cppman-0.4.8 b/metadata/md5-cache/app-doc/cppman-0.4.8
index 75c782e9ba4e..dad4e0cbbade 100644
--- a/metadata/md5-cache/app-doc/cppman-0.4.8
+++ b/metadata/md5-cache/app-doc/cppman-0.4.8
@@ -4,11 +4,11 @@ DESCRIPTION=C++ man pages for Linux, with source from cplusplus.com and cpprefer
 EAPI=6
 HOMEPAGE=https://github.com/aitjcize/cppman
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=sys-apps/groff dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aitjcize/cppman/archive/0.4.8.tar.gz -> cppman-0.4.8.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4aac1088ac1a2842b4deaafde3137876
+_md5_=570aab2dbb38174bf1aad686039fb1df
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 1dc2361294a7..623b754a96f4 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/qemacs-0.4.1_pre20170225 b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
index ee31f9c057dd..87eb77edd74b 100644
--- a/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
+++ b/metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
@@ -4,11 +4,11 @@ DESCRIPTION=QEmacs is a very small but powerful UNIX editor
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/qemacs/
 IUSE=X png unicode xv
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~x86
 LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXext xv? ( x11-libs/libXv ) ) png? ( >=media-libs/libpng-1.2:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/qemacs-0.4.1_pre20170225.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9d81849c2ebcd49ca64ea6b52d39a357
+_md5_=88ca14f7b7147597d9bb4ca576edbce2
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 0edaa33b4b32..7b7ce9c2abd4 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/magit-2.11.0 b/metadata/md5-cache/app-emacs/magit-2.11.0
index 06d0d10b5100..2e141021f41a 100644
--- a/metadata/md5-cache/app-emacs/magit-2.11.0
+++ b/metadata/md5-cache/app-emacs/magit-2.11.0
@@ -3,10 +3,10 @@ DEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 sys-apps/texinfo >=
 DESCRIPTION=A Git porcelain inside Emacs
 EAPI=6
 HOMEPAGE=https://magit.vc/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/2.11.0.tar.gz -> magit-2.11.0.tar.gz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=9831359e3b3b55c70fc485b4646a1fb5
+_md5_=a273cba4b22c7ef875a83dca5e46111d
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.6.0 b/metadata/md5-cache/app-emacs/with-editor-2.6.0
index fd3771e6c5e1..09dba1389f52 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.6.0
+++ b/metadata/md5-cache/app-emacs/with-editor-2.6.0
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-24
 DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
 EAPI=6
 HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.5.0 >=virtual/emacs-24
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.6.0.tar.gz -> with-editor-2.6.0.tar.gz
 _eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
-_md5_=07a036ad79872d4f4034497c2b2e1b83
+_md5_=4c87ab7e98f4caf02b9489a8dee46afb
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b2276db7769b..d3042bc25d56 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/docker-17.12.1-r1 b/metadata/md5-cache/app-emulation/docker-17.12.1-r1
new file mode 100644
index 000000000000..aa8beb870a52
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-17.12.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp
+KEYWORDS=amd64 ~arm
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.1 ~app-emulation/docker-runc-1.0.0_rc4_p20180122[apparmor?,seccomp?] >=app-emulation/docker-proxy-0.8.0_p20170917 container-init? ( >=sys-process/tini-0.16.1[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v17.12.1-ce.tar.gz -> docker-17.12.1.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=45e26822d4aec16c72d0e3b47d2d4cdb
diff --git a/metadata/md5-cache/app-emulation/docker-18.03.0-r1 b/metadata/md5-cache/app-emulation/docker-18.03.0-r1
new file mode 100644
index 000000000000..e254b7c165c0
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/docker-18.03.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) >=dev-lang/go-1.9 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp
+KEYWORDS=~amd64 ~arm
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl ~app-emulation/containerd-1.0.2 ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] ~app-emulation/docker-proxy-0.8.0_p20180314 container-init? ( >=sys-process/tini-0.16.1[static] )
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker-ce/archive/v18.03.0-ce.tar.gz -> docker-18.03.0.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	golang-base	928887539e385bb489681b292f6b862f	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=8103c982b63b51470c2401213d12dff3
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
new file mode 100644
index 000000000000..f72fa2217d13
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=runc container cli tools
+EAPI=6
+HOMEPAGE=http://runc.io
+IUSE=+ambient apparmor hardened +seccomp
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
+SLOT=0
+SRC_URI=https://github.com/opencontainers/runc/archive/v1.0.0-rc5.tar.gz -> runc-1.0.0_rc5.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=493a934c155c2b291603fff47f1be311
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index ad754eef46ef..d702502f3cf3 100644
--- a/metadata/md5-cache/app-eselect/Manifest.gz
+++ b/metadata/md5-cache/app-eselect/Manifest.gz
diff --git a/metadata/md5-cache/app-eselect/eselect-chuck-1.0.1 b/metadata/md5-cache/app-eselect/eselect-chuck-1.0.1
deleted file mode 100644
index 802f54e9a59c..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-chuck-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!<=media-sound/chuck-1.2.1.2
-DESCRIPTION=Manages the /usr/bin/chuck symlink
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.2.3
-SLOT=0
-SRC_URI=mirror://gentoo/chuck.eselect-1.0.1.bz2
-_md5_=6baf31794b88abc6f373b38272e5c67d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index df3cdd6e3c66..e28c9dff14a8 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/beep-1.3-r3 b/metadata/md5-cache/app-misc/beep-1.3-r3
index 6c97b55abc79..ba47a97a811e 100644
--- a/metadata/md5-cache/app-misc/beep-1.3-r3
+++ b/metadata/md5-cache/app-misc/beep-1.3-r3
@@ -3,9 +3,9 @@ DESCRIPTION=The advanced PC speaker beeper
 EAPI=6
 HOMEPAGE=http://www.johnath.com/beep
 IUSE=suid
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.johnath.com/beep/beep-1.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4210ade5db4743eddb9886a4d345f129
+_md5_=bac5c7c44fc27d30971e9dedcd9839e8
diff --git a/metadata/md5-cache/app-misc/binwalk-2.1.1 b/metadata/md5-cache/app-misc/binwalk-2.1.1
index 7798c3dd4cca..bd1188897d35 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.1.1
+++ b/metadata/md5-cache/app-misc/binwalk-2.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A tool for identifying files embedded inside firmware images
 EAPI=6
 HOMEPAGE=https://github.com/devttys0/binwalk
 IUSE=graph python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) graph? ( dev-python/pyqtgraph[opengl,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/devttys0/binwalk/archive/v2.1.1.tar.gz -> binwalk-2.1.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=981f17a181bbd43865428acefb9f4428
+_md5_=b6b85d4b3636c19aff5bbb96b90d1a0f
diff --git a/metadata/md5-cache/app-misc/binwalk-9999 b/metadata/md5-cache/app-misc/binwalk-9999
index ff0b6536160c..181b93b268ee 100644
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( dev-python/backports-lzma[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	git-r3	25b08efef07cea6bcd45b8c6dcce2782	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8090277407d1e1e703e509739c82b1d
+_md5_=78c8c0a735240e71cda9a8127cf6e8f6
diff --git a/metadata/md5-cache/app-misc/dtach-0.9 b/metadata/md5-cache/app-misc/dtach-0.9
index 64aa16af19ea..2fba497750d8 100644
--- a/metadata/md5-cache/app-misc/dtach-0.9
+++ b/metadata/md5-cache/app-misc/dtach-0.9
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Emulates the detach feature of screen
 EAPI=6
 HOMEPAGE=http://dtach.sourceforge.net/ https://github.com/crigler/dtach
-KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/dtach/dtach-0.9.tar.gz
-_md5_=4f1ade0c634e526878b0a511ae3ab6f9
+_md5_=f84b86f479dd355bb85d72013ffe6dac
diff --git a/metadata/md5-cache/app-misc/dvtm-0.15-r3 b/metadata/md5-cache/app-misc/dvtm-0.15-r3
index 763c29ffbfeb..6edcc483b419 100644
--- a/metadata/md5-cache/app-misc/dvtm-0.15-r3
+++ b/metadata/md5-cache/app-misc/dvtm-0.15-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Dynamic virtual terminal manager
 EAPI=6
 HOMEPAGE=http://www.brain-dump.org/projects/dvtm/
 IUSE=savedconfig
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=>=sys-libs/ncurses-6.1:0=[unicode]
 SLOT=0
 SRC_URI=http://www.brain-dump.org/projects/dvtm/dvtm-0.15.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6256763ce0a583dbeafa43dc9ddc0027
+_md5_=a8b9d603521d47429f520fcfcf0a2d86
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11-r2 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11-r2
deleted file mode 100644
index da4548dd193f..000000000000
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre11-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
-EAPI=0
-HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre11.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2282c1ab8e3c45c6221ddeb4cc980153
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r1 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r1
deleted file mode 100644
index 00713f5f280f..000000000000
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Inputlirc daemon to utilize /dev/input/event*
-EAPI=0
-HOMEPAGE=https://github.com/ferdinandhuebner/inputlirc
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=31e61d97d188c52dd16f5cfb29b35f5d
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.0 b/metadata/md5-cache/app-misc/lirc-0.10.0
new file mode 100644
index 000000000000..daaa4ba3d0cd
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lirc-0.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
+DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
+EAPI=6
+HOMEPAGE=http://www.lirc.org/
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) gtk? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/lirc/lirc-0.10.0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=40be7a3c13dbdc04b698287918384230
diff --git a/metadata/md5-cache/app-misc/lirc-0.9.4d b/metadata/md5-cache/app-misc/lirc-0.9.4d
index 31eec50139a0..3a6d0b5d957f 100644
--- a/metadata/md5-cache/app-misc/lirc-0.9.4d
+++ b/metadata/md5-cache/app-misc/lirc-0.9.4d
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare setup
+DEPEND=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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=6
 HOMEPAGE=http://www.lirc.org/
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) gtk? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/lirc/lirc-0.9.4d.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c7da6739eaa7fbeb181becc65d9deb5
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=eef5be64ee7e3c47b38b07605afeec1f
diff --git a/metadata/md5-cache/app-misc/screenfetch-3.8.0 b/metadata/md5-cache/app-misc/screenfetch-3.8.0
index 1ecaf58fc7bb..20fce6a3bb8f 100644
--- a/metadata/md5-cache/app-misc/screenfetch-3.8.0
+++ b/metadata/md5-cache/app-misc/screenfetch-3.8.0
@@ -3,9 +3,9 @@ DESCRIPTION=Bash Screenshot Information Tool
 EAPI=6
 HOMEPAGE=https://github.com/KittyKatt/screenFetch
 IUSE=curl X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
 SLOT=0
 SRC_URI=https://github.com/KittyKatt/screenFetch/archive/v3.8.0.tar.gz -> screenfetch-3.8.0.tar.gz
-_md5_=13e89cd70629346270e1f74cdf72926d
+_md5_=4577b37575227d8df78d40a8e3a7530d
diff --git a/metadata/md5-cache/app-misc/screenfetch-9999 b/metadata/md5-cache/app-misc/screenfetch-9999
index 3649bcb9d88c..d760367473e8 100644
--- a/metadata/md5-cache/app-misc/screenfetch-9999
+++ b/metadata/md5-cache/app-misc/screenfetch-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=curl? ( net-misc/curl ) X? ( media-gfx/scrot x11-apps/xdpyinfo )
 SLOT=0
 _eclasses_=git-r3	25b08efef07cea6bcd45b8c6dcce2782
-_md5_=13e89cd70629346270e1f74cdf72926d
+_md5_=4577b37575227d8df78d40a8e3a7530d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3d58e614a1cd..cb608aa0ec8b 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/calligra-3.0.1 b/metadata/md5-cache/app-office/calligra-3.0.1
deleted file mode 100644
index c4461577409b..000000000000
--- a/metadata/md5-cache/app-office/calligra-3.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Office Suite
-EAPI=6
-HOMEPAGE=https://www.calligra.org/
-IUSE=activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_braindump calligra_experimental_features_stage debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5] ) fontconfig? ( media-libs/fontconfig ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_braindump? ( >=dev-qt/qtwebkit-5.7.1:5 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=dev-qt/qtcore-5.7.1:5= dev-libs/kdiagram:5 =dev-libs/kproperty-3.0*:5 =dev-libs/kreport-3.0*:5 pim? ( >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-14.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/calligra/3.0.1/calligra-3.0.1.tar.xz
-_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39330f99676bbc81e6557715e2731e69
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r2 b/metadata/md5-cache/app-office/calligra-3.1.0-r2
index fef27e692707..32bbe0024cc6 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r2
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=KDE Office Suite
 EAPI=6
 HOMEPAGE=https://www.calligra.org/
 IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.7.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.40.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.7.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/kholidays-5.40.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
 _eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1cc12c3104b9d7bdd88f4d99fa084b89
+_md5_=819627cab6b9f1a0b75118a6e16eb6fa
diff --git a/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1 b/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
deleted file mode 100644
index 680bdab76d69..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-4.8.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde-frameworks/kdelibs:4 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) test? ( dev-qt/qttest:4 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Personal finance manager by KDE
-EAPI=6
-HOMEPAGE=https://kmymoney.org/
-IUSE=calendar debug doc +handbook hbci ofx quotes test weboob test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.0[cxx] <app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/libgpg-error dev-qt/qtcore:4[ssl] dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtsvg:4 kde-frameworks/kdelibs:4 x11-misc/shared-mime-info calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.5.1 >=sys-libs/gwenhywfar-4.15.3[qt4] ) ofx? ( >=dev-libs/libofx-0.9.4 ) weboob? ( www-client/weboob ) kde-frameworks/oxygen-icons:* handbook? ( kde-frameworks/kdelibs:4[handbook] ) quotes? ( dev-perl/Finance-Quote )
-SLOT=4
-SRC_URI=mirror://kde/stable/kmymoney/4.8.1.1/src/kmymoney-4.8.1.1.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e514badc45752e8a6ae6a6c66edc2033
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2 b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
index 66b5e43e456d..695bdf6b47de 100644
--- a/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Personal finance manager based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://kmymoney.org
 IUSE=activities addressbook calendar hbci holidays ofx quotes weboob test debug +handbook test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-6.0.0 dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.40.0:5 ) addressbook? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.6.5 >=sys-libs/gwenhywfar-4.15.3-r1[qt5] ) holidays? ( || ( >=kde-frameworks/kholidays-5.40.0:5 >=kde-apps/kholidays-14.12.0:5 ) ) ofx? ( dev-libs/libofx ) weboob? ( 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-qt/qtconcurrent-5.7.1:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-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-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=weboob? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kmymoney/5.0.1/src/kmymoney-5.0.1.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5588ed1a39da165e56ad3dda3d740704
+_md5_=a265370df8f97336880a77ca25c8b648
diff --git a/metadata/md5-cache/app-office/libalkimia-5.0.0 b/metadata/md5-cache/app-office/libalkimia-5.0.0
deleted file mode 100644
index ec70d125a1d5..000000000000
--- a/metadata/md5-cache/app-office/libalkimia-5.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/gmp:0=[cxx] dev-qt/qtcore:4 dev-qt/qtdbus:4 kde-frameworks/kdelibs:4 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Library with common classes and functionality used by KDE finance applications
-EAPI=6
-HOMEPAGE=https://community.kde.org/Alkimia/libalkimia
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/gmp:0=[cxx] dev-qt/qtcore:4 dev-qt/qtdbus:4 kde-frameworks/kdelibs:4
-SLOT=0/5
-SRC_URI=mirror://kde/stable/alkimia/5.0.0/src/libalkimia-5.0.0.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=49522bb0e6138fed5f9d5f84fc52d0b7
diff --git a/metadata/md5-cache/app-office/libalkimia-7.0.1 b/metadata/md5-cache/app-office/libalkimia-7.0.1
index 458c7cfd45f9..b70581a9eeee 100644
--- a/metadata/md5-cache/app-office/libalkimia-7.0.1
+++ b/metadata/md5-cache/app-office/libalkimia-7.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Library with common classes and functionality used by KDE finance ap
 EAPI=6
 HOMEPAGE=https://www.linux-apps.com/content/show.php/libalkimia?content=137323
 IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 dev-libs/gmp:0=[cxx] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0/7
 SRC_URI=mirror://kde/stable/alkimia/7.0.1/src/alkimia-7.0.1.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9985c7501d0ef31f80bec8b43bc3ca12
+_md5_=b382a80b4b160577bbd6e898bdc97580
diff --git a/metadata/md5-cache/app-officeext/Manifest.gz b/metadata/md5-cache/app-officeext/Manifest.gz
index 7de83855f7f7..22929fc3983c 100644
--- a/metadata/md5-cache/app-officeext/Manifest.gz
+++ b/metadata/md5-cache/app-officeext/Manifest.gz
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.53 b/metadata/md5-cache/app-officeext/ooofbtools-2.53
new file mode 100644
index 000000000000..27c64374c2d1
--- /dev/null
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.53
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm unpack
+DEPEND=office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin ) app-arch/unzip
+DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/fbtools/
+IUSE=office_implementation_libreoffice office_implementation_openoffice
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
+REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
+SLOT=0
+SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.53.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	office-ext-r1	460677ac03e24e7f80605d673e145100	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0cbf955ea0a063397bb95465be973f17
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index c72299ac1f74..0ecf88a9dd18 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/pfl-2.4-r5 b/metadata/md5-cache/app-portage/pfl-2.4-r5
index 9a9ba56b7a91..fa6a20148e21 100644
--- a/metadata/md5-cache/app-portage/pfl-2.4-r5
+++ b/metadata/md5-cache/app-portage/pfl-2.4-r5
@@ -4,11 +4,11 @@ DESCRIPTION=Searchable online file/package database for Gentoo
 EAPI=5
 HOMEPAGE=http://www.portagefilelist.de
 IUSE=+network-cron python_targets_python2_7
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=net-misc/curl || ( sys-apps/portage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/portage-mgorny[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://files.portagefilelist.de/pfl-2.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbe2d1fc8327ea74d34f2359cc394b81
+_md5_=d235ae5e3d3b6e8ebcdb164e3b1c8e57
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.62 b/metadata/md5-cache/app-portage/portage-utils-0.62
index 01e2af3ffa87..2ec9fd6c909d 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.62
+++ b/metadata/md5-cache/app-portage/portage-utils-0.62
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=4
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=m68k
+KEYWORDS=m68k s390
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.62.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.62.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23b19ef4e150c1dd0690e3fe7a58bea8
+_md5_=6e01d8dd224e13bd259ce3e4eff2b03c
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index a8315c7d31f4..97f352ce855e 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/autojump-22.5.1 b/metadata/md5-cache/app-shells/autojump-22.5.1
index 86a047eac935..b343bd214dd8 100644
--- a/metadata/md5-cache/app-shells/autojump-22.5.1
+++ b/metadata/md5-cache/app-shells/autojump-22.5.1
@@ -4,7 +4,7 @@ DESCRIPTION=change directory command that learns
 EAPI=6
 HOMEPAGE=https://github.com/wting/autojump
 IUSE=ipython test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=ipython? ( 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=ipython? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wting/autojump/archive/release-v22.5.1.tar.gz -> autojump-22.5.1.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=aa1d558ddd1171d511f89e34d6099490
+_md5_=6b35bb50eaa3500e3236da5311cce2b9
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.7-r3 b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
index 379645707e6f..5a53401379b7 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.7-r3
+++ b/metadata/md5-cache/app-shells/bash-completion-2.7-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Programmable Completion for bash
 EAPI=6
 HOMEPAGE=https://github.com/scop/bash-completion
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp !!net-fs/mc
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/scop/bash-completion/releases/download/2.7/bash-completion-2.7.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f06351dfe5c7af93876c57e253bf229f
+_md5_=be1ee7d714e2d5178cf67e62bb2fa4dc
diff --git a/metadata/md5-cache/app-shells/fish-2.7.1 b/metadata/md5-cache/app-shells/fish-2.7.1
index 1d6342312ede..90db590fda48 100644
--- a/metadata/md5-cache/app-shells/fish-2.7.1
+++ b/metadata/md5-cache/app-shells/fish-2.7.1
@@ -4,9 +4,9 @@ DESCRIPTION=fish is the Friendly Interactive SHell
 EAPI=6
 HOMEPAGE=http://fishshell.com/
 IUSE=nls test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/2.7.1/fish-2.7.1.tar.gz
-_md5_=d47aff920b2c40e2e66c611698ee80c3
+_md5_=9d49da07ef5f3bf269c007fcc91f9dd4
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 50e328776d4e..b5d4e110efd7 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/lesspipe-1.83-r1 b/metadata/md5-cache/app-text/lesspipe-1.83-r1
new file mode 100644
index 000000000000..26add895d83e
--- /dev/null
+++ b/metadata/md5-cache/app-text/lesspipe-1.83-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install preinst
+DEPEND=dev-lang/perl
+DESCRIPTION=a preprocessor for less
+EAPI=6
+HOMEPAGE=https://github.com/wofr06/lesspipe
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl !<sys-apps/less-483-r1
+SLOT=0
+SRC_URI=https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-1.83.tar.gz
+_md5_=aed87fc4543477648eb626ac967d59f2
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11 b/metadata/md5-cache/app-text/rnv-1.7.11
deleted file mode 100644
index 62f7639fbd74..000000000000
--- a/metadata/md5-cache/app-text/rnv-1.7.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/expat app-arch/unzip
-DESCRIPTION=A lightweight Relax NG Compact Syntax validator
-EAPI=4
-HOMEPAGE=http://www.davidashen.net/rnv.html
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/expat
-SLOT=0
-SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e8a8c41d0039de8b6b7d0b1bef605a7
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index 1726c82c79ab..b1a279638a89 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/expat dev-scheme/scm[libscm]
 DESCRIPTION=A lightweight Relax NG Compact Syntax validator
 EAPI=6
 HOMEPAGE=http://www.davidashen.net/rnv.html
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=66ec2ad65480ab78a752e9145571c014
+_md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index f1b10ee4147a..66b14683a638 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/mysqltuner-1.2.0 b/metadata/md5-cache/dev-db/mysqltuner-1.2.0
deleted file mode 100644
index 8aa3544403e2..000000000000
--- a/metadata/md5-cache/dev-db/mysqltuner-1.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=MySQLTuner is a high-performance MySQL tuning script
-EAPI=4
-HOMEPAGE=http://www.mysqltuner.com
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.6 virtual/perl-Getopt-Long >=virtual/mysql-3.23
-SLOT=0
-SRC_URI=https://github.com/rackerhacker/MySQLTuner-perl/tarball/05813a1faa447fe16c2a7efdab9b22c3bcbc5485 -> mysqltuner-1.2.0.tar.gz
-_md5_=fa775cf55581f960d4f2e64780f672c5
diff --git a/metadata/md5-cache/dev-db/mysqltuner-1.6.0 b/metadata/md5-cache/dev-db/mysqltuner-1.6.0
deleted file mode 100644
index e6b61103303e..000000000000
--- a/metadata/md5-cache/dev-db/mysqltuner-1.6.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=MySQLTuner is a high-performance MySQL tuning script
-EAPI=6
-HOMEPAGE=http://www.mysqltuner.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.6 virtual/perl-Getopt-Long >=virtual/mysql-3.23
-SLOT=0
-SRC_URI=https://github.com/major/MySQLTuner-perl/archive/1.6.0.tar.gz -> mysqltuner-1.6.0.tar.gz
-_md5_=caf55ce6e35347b6a3c6c93030ad283d
diff --git a/metadata/md5-cache/dev-db/mysqltuner-1.6.18 b/metadata/md5-cache/dev-db/mysqltuner-1.6.18
index 685770517c4a..247caaf7e993 100644
--- a/metadata/md5-cache/dev-db/mysqltuner-1.6.18
+++ b/metadata/md5-cache/dev-db/mysqltuner-1.6.18
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=MySQLTuner is a high-performance MySQL tuning script
 EAPI=6
 HOMEPAGE=http://www.mysqltuner.com/
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long virtual/mysql
 SLOT=0
 SRC_URI=https://github.com/major/MySQLTuner-perl/archive/1.6.18.tar.gz -> mysqltuner-1.6.18.tar.gz
-_md5_=278206b31d720050446de33a156e838a
+_md5_=87cad36c7eb889154efc4188a97d2a84
diff --git a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1 b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
index bc76c3751e65..4a82cf54468e 100644
--- a/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
+++ b/metadata/md5-cache/dev-db/sqlitebrowser-3.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=SQLite Database Browser
 EAPI=6
 HOMEPAGE=http://sqlitebrowser.org
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3 MPL-2.0
 RDEPEND=dev-cpp/antlr-cpp:2 dev-db/sqlite:3 >=dev-libs/qcustomplot-2.0.0[qt5(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
 SLOT=0
 SRC_URI=https://github.com/sqlitebrowser/sqlitebrowser/archive/v3.10.1.tar.gz -> sqlitebrowser-3.10.1.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2db3669171527f882f212f00d5df21b
+_md5_=e0b5cf157b9fe77b4e7c360b7d04a224
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8d5e5aceb204..5226a72705d7 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/ivykis-0.42.2 b/metadata/md5-cache/dev-libs/ivykis-0.42.2
index a79d46e3ac02..76177ef6ec87 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.2
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
-KEYWORDS=amd64 ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 hppa ia64 ~ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.2.tar.gz -> ivykis-0.42.2.tar.gz
-_md5_=eed724f24675e357281b6f0ef2549471
+_md5_=89f0383fe7cf35c54c89b1a1feb6e939
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4 b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
index 96349d850c1b..8c833f211777 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=C++ JSON reader and writer
 EAPI=6
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 IUSE=doc test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz -> jsoncpp-1.8.4.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48f248415b932adde1ce94ba17ade425
+_md5_=2280c21f025aa45daa728c7bc4f386b3
diff --git a/metadata/md5-cache/dev-libs/libbson-1.8.2 b/metadata/md5-cache/dev-libs/libbson-1.8.2
index d8dd6f0c2e80..01346525c591 100644
--- a/metadata/md5-cache/dev-libs/libbson-1.8.2
+++ b/metadata/md5-cache/dev-libs/libbson-1.8.2
@@ -3,8 +3,8 @@ DESCRIPTION=A BSON utility library
 EAPI=6
 HOMEPAGE=https://github.com/mongodb/libbson
 IUSE=debug examples static-libs
-KEYWORDS=amd64 ~hppa ~ppc x86
+KEYWORDS=amd64 hppa ~ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/mongodb/libbson/releases/download/1.8.2/libbson-1.8.2.tar.gz
-_md5_=b67fb235fbe482c1333594b2a0ffd985
+_md5_=9d4ddefd08cb096d483026cfbf93713f
diff --git a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3 b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
index a984ea42430e..aec2bf2c5eb0 100644
--- a/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
+++ b/metadata/md5-cache/dev-libs/libdaemon-0.14-r3
@@ -4,9 +4,9 @@ DESCRIPTION=Simple library for creating daemon processes in C
 EAPI=6
 HOMEPAGE=http://0pointer.de/lennart/projects/libdaemon/
 IUSE=doc examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f0816bec40221b1a8357755e89abb383
+_md5_=3b22c1bfe65ac3bdae239191a6f5072a
diff --git a/metadata/md5-cache/dev-libs/libgpiod-1.0 b/metadata/md5-cache/dev-libs/libgpiod-1.0
new file mode 100644
index 000000000000..081cf570721d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgpiod-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=C library and tools for interacting with the linux GPIO character device
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/
+IUSE=static-libs +tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0/1
+SRC_URI=https://dev.gentoo.org/~blueness/libgpiod/libgpiod-1.0.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=50978882fd657f7ac68230641d9c4cce
diff --git a/metadata/md5-cache/dev-libs/liblinear-220 b/metadata/md5-cache/dev-libs/liblinear-220
index f51a08c847f8..31d1ff48a0dc 100644
--- a/metadata/md5-cache/dev-libs/liblinear-220
+++ b/metadata/md5-cache/dev-libs/liblinear-220
@@ -4,10 +4,10 @@ DESCRIPTION=A Library for Large Linear Classification
 EAPI=6
 HOMEPAGE=http://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
 IUSE=blas
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=blas? ( virtual/blas )
 SLOT=0/3
 SRC_URI=https://github.com/cjlin1/liblinear/archive/v220.tar.gz -> liblinear-220.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=54a9421e8fdf6ce912c99e94281e9afc
+_md5_=3a8baa36a8f45f8a991009b5df1ea3cd
diff --git a/metadata/md5-cache/dev-libs/libressl-2.7.0 b/metadata/md5-cache/dev-libs/libressl-2.7.0
deleted file mode 100644
index 427ba2c6b5e2..000000000000
--- a/metadata/md5-cache/dev-libs/libressl-2.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/openssl:0
-DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
-EAPI=6
-HOMEPAGE=https://www.libressl.org/
-IUSE=+asm 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
-LICENSE=ISC openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!dev-libs/openssl:0
-SLOT=0/45
-SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8ba70bc3543a5daf62709e13d07a309
diff --git a/metadata/md5-cache/dev-libs/libressl-2.7.1 b/metadata/md5-cache/dev-libs/libressl-2.7.1
deleted file mode 100644
index e3fcb021ca07..000000000000
--- a/metadata/md5-cache/dev-libs/libressl-2.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!dev-libs/openssl:0
-DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
-EAPI=6
-HOMEPAGE=https://www.libressl.org/
-IUSE=+asm 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
-LICENSE=ISC openssl
-PDEPEND=app-misc/ca-certificates
-RDEPEND=!dev-libs/openssl:0
-SLOT=0/45
-SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8ba70bc3543a5daf62709e13d07a309
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.19-r1 b/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
index 3d05851a0b4a..c6996c0918bd 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.19-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
+DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
 DESCRIPTION=Userspace access to USB devices
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libusb.info/
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
 SLOT=1
 SRC_URI=mirror://sourceforge/libusb/libusb-1.0.19.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=171eced8870b7e44b308066670fc4949
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1aa0042d172c203e1a016d6d019a52d6
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.20 b/metadata/md5-cache/dev-libs/libusb-1.0.20
index 0154846062e1..51a7a4214a68 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.20
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.20
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
+DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
 DESCRIPTION=Userspace access to USB devices
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libusb.info/ https://github.com/libusb/libusb
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.20/libusb-1.0.20.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5449ca039a01cc554cac60912ba9e077
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e2b5267c59645eb1c567675a0c3e7a67
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.21 b/metadata/md5-cache/dev-libs/libusb-1.0.21
index 605f59169c32..059a5eb94b20 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.21
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.21
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install test
 DEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )
 DESCRIPTION=Userspace access to USB devices
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libusb.info/ https://github.com/libusb/libusb
 IUSE=debug doc examples static-libs test udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] )
 SLOT=1
 SRC_URI=https://github.com/libusb/libusb/releases/download/v1.0.21/libusb-1.0.21.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe135fb564e8127025a69aafc0063357
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=264e175016623d0fe61f6205fa14c893
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
index a1f5cd38ded7..11ec904257c2 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 virtual/pkgconfig
 DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libusb.sourceforge.net/
 IUSE=debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=519d5e7d015f84df2f5fc93c7817df68
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7df1f3bed364a64c335a543f4be088b9
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
index 86c7e805f7b4..7fcffe5ea58b 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 virtual/pkgconfig
 DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://libusb.sourceforge.net/
 IUSE=debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
-RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=>=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42846d069d9753389f5ea4e328e9364f
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5aa20561a959fbe147689bd12a057487
diff --git a/metadata/md5-cache/dev-libs/lzo-2.10 b/metadata/md5-cache/dev-libs/lzo-2.10
index 569b0a681c14..c33d763b00d5 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.10
+++ b/metadata/md5-cache/dev-libs/lzo-2.10
@@ -3,9 +3,9 @@ DESCRIPTION=An extremely fast compression and decompression library
 EAPI=6
 HOMEPAGE=http://www.oberhumer.com/opensource/lzo/
 IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=2
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9dde715b46431aaa268e537391cbabdd
+_md5_=55aa4832e87af08b6fde8ccf8c036d8b
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.8.2 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.8.2
index beb1f6681d58..bdad75fc9320 100644
--- a/metadata/md5-cache/dev-libs/mongo-c-driver-1.8.2
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A high-performance MongoDB driver for C
 EAPI=6
 HOMEPAGE=https://github.com/mongodb/mongo-c-driver
 IUSE=debug examples libressl sasl ssl static-libs test
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=app-arch/snappy:= >=dev-libs/libbson-1.8.2 sys-libs/zlib:= sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=x86? ( test )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.8.2/mongo-c-driver-1.8.2.tar.gz
-_md5_=d76ba07bdbd64445e55d2515caa3cfae
+_md5_=d4500d9508279a469e6fded1afacc0a7
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
index 5801e760da6f..b25a81b56755 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
@@ -4,11 +4,11 @@ DESCRIPTION=An ISO-C:1999 API with CLI for generating DCE, ISO/IEC and RFC compl
 EAPI=6
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
 IUSE=+cxx perl php static-libs php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=perl? ( dev-lang/perl:= ) php? ( !dev-php/pecl-uuid ) php? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
 REQUIRED_USE=php? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4153b29bf29be7cb00a19d8bc2385fb4
+_md5_=57f2d4bd4f0c7bcf74da084358a7bda4
diff --git a/metadata/md5-cache/dev-libs/ptexenc-1.3.5_p20170524 b/metadata/md5-cache/dev-libs/ptexenc-1.3.5_p20170524
index 952a307dac45..ff6e44f497ba 100644
--- a/metadata/md5-cache/dev-libs/ptexenc-1.3.5_p20170524
+++ b/metadata/md5-cache/dev-libs/ptexenc-1.3.5_p20170524
@@ -4,10 +4,10 @@ DESCRIPTION=Library for Japanese pTeX providing a better way of handling charact
 EAPI=5
 HOMEPAGE=http://tutimura.ath.cx/ptexlive/?ptexenc
 IUSE=iconv static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=iconv? ( virtual/libiconv ) dev-libs/kpathsea
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ead3f128dee2861eb4f5cc38d1ee5b0d
+_md5_=a0a43eb38b4d24285b2110e33dd7bf05
diff --git a/metadata/md5-cache/dev-libs/qcustomplot-2.0.0 b/metadata/md5-cache/dev-libs/qcustomplot-2.0.0
index cfecb60a30c8..5972bcf4102f 100644
--- a/metadata/md5-cache/dev-libs/qcustomplot-2.0.0
+++ b/metadata/md5-cache/dev-libs/qcustomplot-2.0.0
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 DESCRIPTION=Qt C++ widget for plotting and data visualization
 EAPI=6
 HOMEPAGE=http://www.qcustomplot.com/
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://www.qcustomplot.com/release/2.0.0/QCustomPlot-sharedlib.tar.gz -> qcustomplot-sharedlib-2.0.0.tar.gz http://www.qcustomplot.com/release/2.0.0/QCustomPlot-source.tar.gz -> qcustomplot-source-2.0.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e807a2be391d51dafca2a7ddac26efc3
+_md5_=bd1c4e8c50e571396d8bfe56e0da0418
diff --git a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0 b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
index 8079b5f41d48..e3f5daa34dce 100644
--- a/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
+++ b/metadata/md5-cache/dev-perl/Any-Moose-0.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=Use Moose or Mouse modules (DEPRECATED)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Any-Moose/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Moose virtual/perl-version dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b546b4a68258652bd05daedd608d1739
+_md5_=c29ef6388fc222e6c85fbd2e7cd5f692
diff --git a/metadata/md5-cache/dev-perl/AnyEvent-7.140.0 b/metadata/md5-cache/dev-perl/AnyEvent-7.140.0
index ec856f4c7f9b..1bd2f3a078d0 100644
--- a/metadata/md5-cache/dev-perl/AnyEvent-7.140.0
+++ b/metadata/md5-cache/dev-perl/AnyEvent-7.140.0
@@ -3,10 +3,10 @@ DEPEND=>=virtual/perl-ExtUtils-MakeMaker-6.520.0 dev-perl/Canary-Stability dev-l
 DESCRIPTION=Provides a uniform interface to various event loops
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/AnyEvent/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b8cdeb096428daf0350becf1d1022082
+_md5_=3e1fecf5a9281d301bb6ac109e5fa80e
diff --git a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1 b/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
index be8d7531e675..d44352a81684 100644
--- a/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-AuthCookie-3.270.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Authentication and Authorization via cookies
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Apache-AuthCookie/
 IUSE=test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=www-apache/mod_perl-2 virtual/perl-Carp >=dev-perl/Class-Load-0.30.0 virtual/perl-Encode dev-perl/HTTP-Body dev-perl/Hash-MultiValue dev-perl/WWW-Form-UrlEncoded dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=764bdcaacb246eadb44431e161d7c736
+_md5_=fff301ad863e26c5cb54ee1871586620
diff --git a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2 b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
index c29bc057f41b..236689d045cc 100644
--- a/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Apache-DBI-1.120.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Authentication and Authorization via Perl's DBI
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Apache-DBI/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Digest-SHA1-2.10.0 >=virtual/perl-Digest-MD5-2.2 >=dev-perl/DBI-1.30 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Apache-DBI-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e0a24b7dc710e756a5891c13811a5ef4
+_md5_=7dbe5088bc9ee21356e0f7490d216be4
diff --git a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1 b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
index 78c9afe27d74..f2163742ae71 100644
--- a/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
+++ b/metadata/md5-cache/dev-perl/Apache-Reload-0.130.0-r1
@@ -3,10 +3,10 @@ DEPEND=www-apache/mod_perl dev-perl/Apache-Test dev-lang/perl:=
 DESCRIPTION=Automatically reload changed modules without restarting Apache
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Apache-Reload/
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=www-apache/mod_perl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Reload-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=49570bb229660cc17ba5a20abcb0b44c
+_md5_=e5f4ce3623eb2e19c37d80c25c877976
diff --git a/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2 b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
index abfb0b407a34..d033ba1ac3b2 100644
--- a/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
+++ b/metadata/md5-cache/dev-perl/Apache-Test-1.400.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Test.pm wrapper with helpers for testing Apache
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Apache-Test/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND==www-servers/apache-2* dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz
 _eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=68f4af9ecdb7278345f5c1c63228c16f
+_md5_=6f26348d7a9fcb64bebd958825c78365
diff --git a/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0 b/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0
index b7adcfa7e3b0..dc0306b5f224 100644
--- a/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0
+++ b/metadata/md5-cache/dev-perl/Archive-Zip-1.600.0
@@ -4,10 +4,10 @@ DESCRIPTION=A wrapper that lets you read Zip archive members as if they were fil
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Archive-Zip/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Compress-Raw-Zlib-2.17.0 virtual/perl-File-Path >=virtual/perl-File-Spec-0.800.0 virtual/perl-File-Temp virtual/perl-IO virtual/perl-Time-Local dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.60.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9faccc1e65bf062aa8fad8cd283a7898
+_md5_=2e8d30c90c788d8ef28f6be04489bfbf
diff --git a/metadata/md5-cache/dev-perl/Array-Compare-3.0.0 b/metadata/md5-cache/dev-perl/Array-Compare-3.0.0
index a600ea36e258..a32a4cd06db2 100644
--- a/metadata/md5-cache/dev-perl/Array-Compare-3.0.0
+++ b/metadata/md5-cache/dev-perl/Array-Compare-3.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for comparing arrays
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Array-Compare/
 IUSE=test
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Moo dev-perl/Type-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.0.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f29420bbdf868d7c60328abeeef2269f
+_md5_=df6b95a5c4ee84a811c15ba3614b6d94
diff --git a/metadata/md5-cache/dev-perl/AtExit-2.30.0 b/metadata/md5-cache/dev-perl/AtExit-2.30.0
index 4f79097c877d..0148aa734b19 100644
--- a/metadata/md5-cache/dev-perl/AtExit-2.30.0
+++ b/metadata/md5-cache/dev-perl/AtExit-2.30.0
@@ -4,10 +4,10 @@ DESCRIPTION=atexit() function to register exit-callbacks
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/AtExit/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc sparc x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic Artistic-2 )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/AtExit-2.03.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=cc7c3d3942e4b8888e460b4d02adb648
+_md5_=74a4a37e0ed62df091bd0d2718ff05f0
diff --git a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2 b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2
index 21c7315a2801..68a41a863046 100644
--- a/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2
+++ b/metadata/md5-cache/dev-perl/Audio-CD-disc-cover-0.05-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl Module needed for app-cdr/disc-cover
 EAPI=6
 HOMEPAGE=http://www.vanhemert.co.uk/disc-cover.html
 IUSE=examples
-KEYWORDS=alpha amd64 ~ia64 ~ppc sparc x86
+KEYWORDS=alpha amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/URI-1.10 >=dev-perl/HTML-Parser-3.15 >=virtual/perl-MIME-Base64-2.12 >=virtual/perl-Digest-MD5-2.12 >=virtual/perl-libnet-1.0703-r1 >=dev-perl/libwww-perl-5.50 >=media-libs/libcdaudio-0.99.6 dev-lang/perl:=
 SLOT=0
 SRC_URI=http://www.vanhemert.co.uk/files/Audio-CD-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7fc0effb8856d0a235da537560d9a800
+_md5_=e0acaf3948492255a1ce3bef858b9f8f
diff --git a/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2 b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
index 2b3b338f7f55..8888fa39454c 100644
--- a/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
+++ b/metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to PAM library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Authen-PAM/
 IUSE=examples examples
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/pam dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NIKIP/Authen-PAM-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ca9b5e0de21b976dec7e80c05674b722
+_md5_=73c9b27680faa8583f2e4ada7c6ff475
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0 b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0
index becc63aa3d42..153f6644a870 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-EndOfScope-0.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=Execute code after a scope finished compilation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/B-Hooks-EndOfScope/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Implementation-0.50.0 >=dev-perl/Sub-Exporter-Progressive-0.1.6 >=dev-perl/Variable-Magic-0.480.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=23dead2f7ed4b513f3f6d345dd2e45e2
+_md5_=c2f7d31a14e909e4c1c01bf2577f8c98
diff --git a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0 b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
index d0d38d934350..939f7467e2b2 100644
--- a/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
+++ b/metadata/md5-cache/dev-perl/B-Hooks-OP-Check-0.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=Wrap OP check callbacks
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/B-Hooks-OP-Check/
 IUSE=test
-KEYWORDS=amd64 ~hppa ~ppc x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=841c4820ca430d7ad63be7f459a172d2
+_md5_=c207613b7b151e69c62aa44e6222ce92
diff --git a/metadata/md5-cache/dev-perl/B-Keywords-1.150.0 b/metadata/md5-cache/dev-perl/B-Keywords-1.150.0
index a38519398614..7186d9109f5c 100644
--- a/metadata/md5-cache/dev-perl/B-Keywords-1.150.0
+++ b/metadata/md5-cache/dev-perl/B-Keywords-1.150.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Lists of reserved barewords and symbol names
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/B-Keywords/
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-2 )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.15.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ef933803c811eecfe1d432c67c316342
+_md5_=65a7854c7ff53162536aef2ba2a9fb75
diff --git a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2 b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
index df90be177ee7..401e67168b9b 100644
--- a/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
+++ b/metadata/md5-cache/dev-perl/CDDB-1.222.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=high-level interface to cddb/freedb protocol
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CDDB/
 IUSE=test examples
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-Carp-1.260.0 >=virtual/perl-Encode-2.510.0 >=virtual/perl-IO-1.310.0 >=virtual/perl-MIME-Base64-3.130.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RC/RCAPUTO/CDDB-1.222.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f376e2608208415b9a75603eb17bf49e
+_md5_=86715eb225ce1cec9480df763e70d967
diff --git a/metadata/md5-cache/dev-perl/CGI-4.360.0 b/metadata/md5-cache/dev-perl/CGI-4.360.0
index 8c00dc68ef3e..aad01f3c7520 100644
--- a/metadata/md5-cache/dev-perl/CGI-4.360.0
+++ b/metadata/md5-cache/dev-perl/CGI-4.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Common Gateway Interface Class
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CGI/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Encode virtual/perl-Exporter >=virtual/perl-File-Spec-0.820.0 >=virtual/perl-File-Temp-0.170.0 >=dev-perl/HTML-Parser-3.690.0 virtual/perl-if >=virtual/perl-parent-0.225.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8dbbe9cfef6871642bc087a4e45f462a
+_md5_=347a609bb80be1041714a71e5f14f75f
diff --git a/metadata/md5-cache/dev-perl/CGI-Fast-2.120.0 b/metadata/md5-cache/dev-perl/CGI-Fast-2.120.0
index 11f7a063faea..0c4e63cfd656 100644
--- a/metadata/md5-cache/dev-perl/CGI-Fast-2.120.0
+++ b/metadata/md5-cache/dev-perl/CGI-Fast-2.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=CGI Interface for Fast CGI
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CGI-Fast/
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~mips ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/CGI-4 virtual/perl-Carp >=dev-perl/FCGI-0.670.0 virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7ea90204d8bb984bac390011fe35ce91
+_md5_=288e61cb4af0b5e3efbf3b0ddbfe58c5
diff --git a/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2 b/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2
index 0430ef907c70..e5c47b228afd 100644
--- a/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2
+++ b/metadata/md5-cache/dev-perl/CGI-FastTemplate-1.90.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=High Performance Templates and Variable Interpolation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CGI-FastTemplate/
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~sparc x86
+KEYWORDS=alpha amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JM/JMOORE/CGI-FastTemplate-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=27808f05086d709deb322e8c9aed10a8
+_md5_=1838c7df6690422562a2f62495407837
diff --git a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0 b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
index f0df0e3c5726..5a82bd8d9efa 100644
--- a/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
+++ b/metadata/md5-cache/dev-perl/CPAN-Meta-Check-0.14.0
@@ -4,10 +4,10 @@ DESCRIPTION=Verify requirements in a CPAN::Meta object
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/CPAN-Meta-Check/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=virtual/perl-CPAN-Meta-2.132.830 >=virtual/perl-CPAN-Meta-Requirements-2.121.0 virtual/perl-Exporter >=virtual/perl-Module-Metadata-1.0.23 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=b35921508de9cfca985efcc97cb4a8e6
+_md5_=0b07aba8b2ecafb1b289ae20e80a3538
diff --git a/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0 b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
index 6ad164eca61d..c280cc0f97c8 100644
--- a/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
+++ b/metadata/md5-cache/dev-perl/Canary-Stability-2012.0.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Canary to check perl compatibility for schmorp's modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Canary-Stability/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c9213ddd95d70a4021e9544556283301
+_md5_=559d933c578b53ade331d2e783531253
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
index 2d63a4a02504..295f57a2c0a6 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
@@ -4,10 +4,10 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.46.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=bc13f04c062d9bf6e9422e035d319e01
+_md5_=91703d73edc3dc6bb8fad60fd8b49c45
diff --git a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0 b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
index 28cd8268a2f5..049d06a43725 100644
--- a/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
+++ b/metadata/md5-cache/dev-perl/Carp-Assert-More-1.160.0
@@ -4,10 +4,10 @@ DESCRIPTION=convenience wrappers around Carp::Assert
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Carp-Assert-More/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Carp-Assert virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=10da5048514b8266f7e3aebd0a628608
+_md5_=319a20f5b4e2a51b8edfe4673415b64f
diff --git a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0 b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
index cc72acaa3882..63089e16b242 100644
--- a/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
+++ b/metadata/md5-cache/dev-perl/Chatbot-Eliza-1.80.0
@@ -4,10 +4,10 @@ DESCRIPTION=A clone of the classic Eliza program
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Chatbot-Eliza/
 IUSE=test examples
-KEYWORDS=alpha amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=alpha amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GR/GRANTG/Chatbot-Eliza-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5770394b21b9b29d49fdb76d9fc88b8b
+_md5_=222bc70e1c042a1fca2d851462bcdb5c
diff --git a/metadata/md5-cache/dev-perl/Class-C3-0.330.0 b/metadata/md5-cache/dev-perl/Class-C3-0.330.0
index e255842c5ad1..9cae184d5396 100644
--- a/metadata/md5-cache/dev-perl/Class-C3-0.330.0
+++ b/metadata/md5-cache/dev-perl/Class-C3-0.330.0
@@ -4,10 +4,10 @@ DESCRIPTION=A pragma to use the C3 method resolution order algortihm
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-C3/
 IUSE=test
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Algorithm-C3-0.70.0 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.33.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=41e41c9d5dd8b1ae9888cbc02b4fd2b0
+_md5_=97edbc5bf0a7a1c45b0196a2566d87e1
diff --git a/metadata/md5-cache/dev-perl/Class-Container-0.120.0-r2 b/metadata/md5-cache/dev-perl/Class-Container-0.120.0-r2
index 10c683b36b1f..0202291f8307 100644
--- a/metadata/md5-cache/dev-perl/Class-Container-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Container-0.120.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Params-Validate-0.24-r1 >=virtual/perl-Scalar-List-Utils-1.08
 DESCRIPTION=Glue object frameworks together transparently
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Container/
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~sparc x86
+KEYWORDS=alpha amd64 ~ia64 ppc sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Params-Validate-0.24-r1 >=virtual/perl-Scalar-List-Utils-1.08 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=84943a939ed6f038e06e3ef90a7fa357
+_md5_=244501549a05903ce9e60fd4ea7e9f4d
diff --git a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2 b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
index fb017bf4b37c..7e23c686638f 100644
--- a/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
+++ b/metadata/md5-cache/dev-perl/Class-DBI-3.0.17-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Simple Database Abstraction
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-DBI/
 IUSE=test
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-solaris
+KEYWORDS=amd64 ~ppc ppc64 x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Class-Accessor-0.18.0 >=dev-perl/Class-Trigger-0.70.0 >=virtual/perl-File-Temp-0.120.0 virtual/perl-Storable >=virtual/perl-Scalar-List-Utils-1.80.0 dev-perl/Clone >=dev-perl/Ima-DBI-0.330.0 virtual/perl-version >=dev-perl/UNIVERSAL-moniker-0.60.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-DBI-v3.0.17.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=cbc994f4ab5259fa022ecae8b3ae711f
+_md5_=104394a026794464f69f5bc20603bfd9
diff --git a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2 b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
index ae6d7a0cb922..41734410912a 100644
--- a/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Data-Inheritable-0.80.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Inheritable, overridable class data
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Data-Inheritable/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7ec348287bec38f20a35c48819c67163
+_md5_=be6eb4d59ccb10819234188b7ac275a8
diff --git a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0 b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0
index 035b15b64bc2..d78a7365044b 100644
--- a/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0
+++ b/metadata/md5-cache/dev-perl/Class-ErrorHandler-0.40.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 DESCRIPTION=Automated accessor generation
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-ErrorHandler/
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Class-ErrorHandler-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a7b57036280d407d02965ffca2406f18
+_md5_=ebbd78ac69200a8ff53427b44ab24d7a
diff --git a/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2 b/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
index 4372a9f9f45e..3cbf4c7bf23e 100644
--- a/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
+++ b/metadata/md5-cache/dev-perl/Class-Factory-Util-1.700.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Module-Build-0.28 dev-lang/perl:=
 DESCRIPTION=Provide utility methods for factory classes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Factory-Util/
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a1820fba20e77bb6be73b04d31464d16
+_md5_=2412bcf7412a04882631f0b7496aa930
diff --git a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0 b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
index 123df983eccc..6ea83e5c7b33 100644
--- a/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
+++ b/metadata/md5-cache/dev-perl/Class-ISA-0.360.0
@@ -4,10 +4,10 @@ DESCRIPTION=Report the search path thru an ISA tree
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-ISA/
 IUSE=test
-KEYWORDS=alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-solaris
+KEYWORDS=alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=85086ce62d106417a4aec11d94b9db54
+_md5_=8fc961bad6155907d616ccc105b22b4c
diff --git a/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0 b/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
index 67b744f40788..451d5e42a81b 100644
--- a/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
+++ b/metadata/md5-cache/dev-perl/Class-Inspector-1.320.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides information about Classes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Inspector/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=21afdfd0112dee2852ef9bbbb2c1772c
+_md5_=e6799ffced9ec4f52fd2bac90f4769c6
diff --git a/metadata/md5-cache/dev-perl/Class-Load-0.240.0 b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
index f2b05b37e4e5..d4f94a4f41ed 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-0.240.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=A working (require q{Class::Name}) and more
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Load/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Data-OptList virtual/perl-Exporter >=dev-perl/Module-Implementation-0.40.0 >=dev-perl/Module-Runtime-0.12.0 >=dev-perl/Package-Stash-0.140.0 virtual/perl-Scalar-List-Utils dev-perl/Try-Tiny dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=7edc5867f24d8a5dbd724931856da046
+_md5_=7f34d0f2c1635be0963435a7e6798d82
diff --git a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0 b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
index 19715e13139a..2951f43dd83d 100644
--- a/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
+++ b/metadata/md5-cache/dev-perl/Class-Load-XS-0.100.0
@@ -4,10 +4,10 @@ DESCRIPTION=XS implementation of parts of Class::Load
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Load-XS/
 IUSE=test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~x64-macos
 LICENSE=Artistic-2
 RDEPEND=>=dev-perl/Class-Load-0.200.0 virtual/perl-XSLoader dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6500b912f2afa3a9f1efd49b641d05a6
+_md5_=397c2ec6289e1c33ed1f1bdea92569be
diff --git a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0 b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
index 80d41b8a4c1c..73f1769fc21b 100644
--- a/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
+++ b/metadata/md5-cache/dev-perl/Class-Virtual-0.80.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class for virtual base classes
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Class-Virtual/
 IUSE=test
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86 ~x86-solaris
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Class-Data-Inheritable-0.20.0 >=dev-perl/Carp-Assert-0.100.0 >=dev-perl/Class-ISA-0.31 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ffccfc739499f2f02cd835ca5787c491
+_md5_=86c626358ad68f270b72dddb6f188d0f
diff --git a/metadata/md5-cache/dev-perl/Clipboard-0.130.0-r3 b/metadata/md5-cache/dev-perl/Clipboard-0.130.0-r3
index a7cf90145af0..c5f5ed0dc2ac 100644
--- a/metadata/md5-cache/dev-perl/Clipboard-0.130.0-r3
+++ b/metadata/md5-cache/dev-perl/Clipboard-0.130.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Copy and paste with any OS
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Clipboard/
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=x11-misc/xclip dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=168795defdd99cbf3f8ec18d538c9cc1
+_md5_=a851ae5f0eeeabdc268f0e310108ab66
diff --git a/metadata/md5-cache/dev-perl/Config-Any-0.320.0 b/metadata/md5-cache/dev-perl/Config-Any-0.320.0
index 40182cf94b62..39fbe00a1320 100644
--- a/metadata/md5-cache/dev-perl/Config-Any-0.320.0
+++ b/metadata/md5-cache/dev-perl/Config-Any-0.320.0
@@ -4,10 +4,10 @@ DESCRIPTION=Load configuration from different file formats, transparently
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Config-Any/
 IUSE=test +conf +ini +json +xml +yaml
-KEYWORDS=amd64 ~arm ~ppc x86 ~ppc-aix
+KEYWORDS=amd64 ~arm ppc x86 ~ppc-aix
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Module-Pluggable-3.600.0 conf? ( >=dev-perl/Config-General-2.470.0 ) !conf? ( !<dev-perl/config-general-2.470.0 !<dev-perl/Config-General-2.470.0 ) ini? ( dev-perl/Config-Tiny ) json? ( || ( dev-perl/Cpanel-JSON-XS dev-perl/JSON-MaybeXS dev-perl/JSON-XS >=virtual/perl-JSON-PP-2 dev-perl/JSON ) ) xml? ( dev-perl/XML-NamespaceSupport dev-perl/XML-Simple ) yaml? ( || ( dev-perl/YAML-LibYAML >=dev-perl/YAML-Syck-0.700.0 dev-perl/YAML ) ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=14b6c080d289a961d328ed9336315d11
+_md5_=abb313b348474a58639e3d2da249326f
diff --git a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0 b/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
index c08485ea6002..e4630b34b6ff 100644
--- a/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
+++ b/metadata/md5-cache/dev-perl/Config-IniFiles-2.940.0
@@ -4,10 +4,10 @@ DESCRIPTION=A module for reading .ini-style configuration files
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Config-IniFiles/
 IUSE=test
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-File-Temp dev-perl/IO-stringy >=virtual/perl-Scalar-List-Utils-1.330.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-2.94.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=dbd4e385a98bc680a47ff20368384184
+_md5_=e426833c4aebef36d30b5d3752d73acf
diff --git a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2 b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2
index 3ce628c5d501..7c2b4affad21 100644
--- a/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2
+++ b/metadata/md5-cache/dev-perl/ConfigReader-0.500.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Read directives from a configuration file
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/ConfigReader/
-KEYWORDS=amd64 ~ia64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ia64 ~ppc sparc x86
 LICENSE=LGPL-2
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AM/AMW/ConfigReader-0.5.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f6eba302364f21cb8fe8a733c51976d9
+_md5_=75174e5894f3847d5b6d0439b35eeecf
diff --git a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0 b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
index 360fdc794e08..04287d27f0ac 100644
--- a/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
+++ b/metadata/md5-cache/dev-perl/Convert-BinHex-1.125.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extract data from Macintosh BinHex files
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Convert-BinHex/
 IUSE=test
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STEPHEN/Convert-BinHex-1.125.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=76e806161c4cb759594b46f50dab439f
+_md5_=d227c2861a975d13eea3f83765bdcccf
diff --git a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900 b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
index 12fe3817a841..70991536f6bb 100644
--- a/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
+++ b/metadata/md5-cache/dev-perl/Cpanel-JSON-XS-3.23.900
@@ -4,10 +4,10 @@ DESCRIPTION=cPanel fork of JSON::XS, fast and correct serializing
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Cpanel-JSON-XS/
 IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-3.0239.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=6167d27e031ecd2ae845cce5590d46da
+_md5_=3a0bcfbc94ab9d9b64cc185ea61fec5b
diff --git a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1 b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
index 70aaa55f31d4..2e03272181b1 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
+++ b/metadata/md5-cache/dev-perl/Crypt-DES-2.70.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Perl DES encryption module
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-DES/
 IUSE=test
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=DES
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c89d7669f0e5cc0eebd35995d832125d
+_md5_=3b4dbda1eb0a90b9375caf353bb5dba0
diff --git a/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2 b/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2
index df81f79fcf32..1411387a799d 100644
--- a/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-DH-0.70.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/gmp dev-perl/Math-BigInt-GMP >=virtual/perl-Math-BigInt-1.60 dev
 DESCRIPTION=Diffie-Hellman key exchange system
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-DH/
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=amd64 ~hppa x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-libs/gmp dev-perl/Math-BigInt-GMP >=virtual/perl-Math-BigInt-1.60 dev-perl/Crypt-Random dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f370f251268f66144735f43c5625a21e
+_md5_=ae7f523a4ea24b23aed195e3a61a1af8
diff --git a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0 b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
index f8233c282f94..69e35d5fa297 100644
--- a/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
+++ b/metadata/md5-cache/dev-perl/Crypt-OpenSSL-Random-0.110.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenSSL/LibreSSL pseudo-random number generator access
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-OpenSSL-Random/
 IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.11.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e789cfda6f8f479741194e457d182d13
+_md5_=06870390bd7fc43e51d897d7c90c91cb
diff --git a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0 b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
index c0301e867e8f..f6fe191a42ea 100644
--- a/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
+++ b/metadata/md5-cache/dev-perl/Crypt-RIPEMD160-0.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for the RIPEMD-160 Hash function
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-RIPEMD160/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/Crypt-RIPEMD160-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9a2ee7fd4e9ab483e3210057d8cb0fd0
+_md5_=9ae7ab769dc232101bc7a9a83425f1ab
diff --git a/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0 b/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
index 9230907289cd..a89f16014c62 100644
--- a/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
+++ b/metadata/md5-cache/dev-perl/Crypt-Random-Source-0.120.0
@@ -4,10 +4,10 @@ DESCRIPTION=Get weak or strong random data from pluggable sources
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-Random-Source/
 IUSE=test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Capture-Tiny-0.80.0 virtual/perl-Carp virtual/perl-File-Spec >=virtual/perl-IO-1.140.0 dev-perl/Module-Find dev-perl/Module-Runtime >=dev-perl/Moo-1.2.0 dev-perl/Sub-Exporter dev-perl/Type-Tiny >=dev-perl/namespace-clean-0.110.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=efcc7d0e6be4551223ec6287b1d04d09
+_md5_=d354a87998343a0f4da7e6240135dbe6
diff --git a/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r2 b/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r2
index c5bb120201f4..b7da05ffbbfa 100644
--- a/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r2
+++ b/metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Digest-MD4 dev-lang/perl:=
 DESCRIPTION=LM/NT hashing, for Samba's smbpasswd entries
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-SmbHash/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/Digest-MD4 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-0.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=72dbb038467e74a747bad35a685aa198
+_md5_=f466c418a64482b2d752f1d1748cf4f3
diff --git a/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2 b/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
index 47e7dec5afea..9461afc9b45d 100644
--- a/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
+++ b/metadata/md5-cache/dev-perl/Curses-UI-0.960.900-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Perl UI framework based on the curses library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Curses-UI/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Curses dev-perl/TermReadKey dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ab74ea9443d0cc7a58015d34ed23e369
+_md5_=685908dd935801df9bf17c2c8d058393
diff --git a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0 b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
index 52654cfe5dcb..60bcad0f09db 100644
--- a/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
+++ b/metadata/md5-cache/dev-perl/Cwd-Guard-0.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Temporary changing working directory (chdir)
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Cwd-Guard/
 IUSE=test minimal
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec virtual/perl-Exporter virtual/perl-if virtual/perl-parent dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2e964908f69e99084c13deec3357108e
+_md5_=3deffc46d35ed7742f79b6578b43c59f
diff --git a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1 b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
index 0986fc4189a7..2a67f45d3c08 100644
--- a/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
+++ b/metadata/md5-cache/dev-perl/DBD-SQLite-1.540.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Self Contained RDBMS in a DBI Driver
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBD-SQLite/
 IUSE=test system-sqlite
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=system-sqlite? ( >=dev-db/sqlite-3.13.0[extensions(+)] <dev-db/sqlite-3.21.0 ) >=dev-perl/DBI-1.570.0 !<dev-perl/DBD-SQLite-1 virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.54.tar.gz https://github.com/kentnl-gentoo/DBD-SQLite/releases/download/1.54-patches-1/DBD-SQLite-1.54-patches-1.tar.xz mirror://gentoo/DBD-SQLite-1.54-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/DBD-SQLite-1.54-patches-1.tar.xz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=58b18e9d24dadd41ce9e7495e4d6e708
+_md5_=4e2c55082ad16138e3d2b6714bd26244
diff --git a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0 b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
index c060a63a5ec2..e9d991a64ef2 100644
--- a/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
+++ b/metadata/md5-cache/dev-perl/Daemon-Generic-0.850.0
@@ -4,10 +4,10 @@ DESCRIPTION=Framework to provide start/stop/reload for a daemon
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Daemon-Generic/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/File-Flock-2013.60.0 dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Getopt-Long virtual/perl-Text-Tabs+Wrap dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MU/MUIR/modules/Daemon-Generic-0.85.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=58125ce36417473bf8ef040c6fffed87
+_md5_=5e6fb7bc07d30fc678b1a1fc4b5ea929
diff --git a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0 b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
index ae37017e38d3..d008346118d5 100644
--- a/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
+++ b/metadata/md5-cache/dev-perl/Data-FormValidator-4.880.0
@@ -4,10 +4,10 @@ DESCRIPTION=Validates user input (usually from an HTML form) based on input prof
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Data-FormValidator/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Image-Size >=dev-perl/Date-Calc-5.0 >=dev-perl/File-MMagic-1.170.0 >=dev-perl/MIME-Types-1.5.0 >=dev-perl/Regexp-Common-0.30.0 dev-perl/Email-Valid virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1b307529eb9af120725822747e772e12
+_md5_=7d00c2ecfdd04280fd7583a8d651bebd
diff --git a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0 b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
index 1d69af7dc696..636cd2057d09 100644
--- a/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
+++ b/metadata/md5-cache/dev-perl/File-Copy-Link-0.140.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for replacing a link by a copy of the linked file
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-Copy-Link/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RM/RMBARKER/File-Copy-Link-0.140.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=532702c201455718df0be4894c4154b8
+_md5_=ab8163da454fc177d25873d6a9853141
diff --git a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0 b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
index 76c51c4fa885..8d97100122ab 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Body-1.220.0
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP Body Parser
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/HTTP-Body/
 IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Digest-MD5 >=virtual/perl-File-Temp-0.140.0 dev-perl/HTTP-Message >=virtual/perl-IO-1.140.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c14b9048ca535b64a265704f40866a5
+_md5_=e596d225a56c6035179f09b25a3a52ca
diff --git a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0 b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
index c18a1c798992..ea1cf9e029a7 100644
--- a/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
+++ b/metadata/md5-cache/dev-perl/IO-Tty-1.120.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=IO::Tty and IO::Pty modules for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/IO-Tty/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5179ea3eb550dd89904e456e9a81b9ec
+_md5_=5b49fd5f7af20bc95c925cc9b66c05d0
diff --git a/metadata/md5-cache/dev-perl/MailTools-2.190.0 b/metadata/md5-cache/dev-perl/MailTools-2.190.0
index ddcadcc140d0..b03219c53f0e 100644
--- a/metadata/md5-cache/dev-perl/MailTools-2.190.0
+++ b/metadata/md5-cache/dev-perl/MailTools-2.190.0
@@ -4,10 +4,10 @@ DESCRIPTION=Manipulation of electronic mail addresses
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MailTools/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/TimeDate virtual/perl-IO >=virtual/perl-libnet-1.50.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.19.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5565295d1bbd6edeaf13059996e9dff5
+_md5_=983702bd800cc0ff135e2676390cff32
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 19f95faa3079..31bfca5a1c5b 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1 b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1
index 837d862b08ba..06b34bc5a96b 100644
--- a/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1
+++ b/metadata/md5-cache/dev-perl/Pod-LaTeX-0.610.0-r1
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-perl/Module-Build dev-lang/pe
 DESCRIPTION=Convert Pod data to formatted LaTeX
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Pod-LaTeX/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Pod-Parser virtual/perl-if dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=9becea9956eaa448d9c5c9f45911d8f2
+_md5_=a1f0ec04ba919c0b45b9c2154e8136fe
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1 b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
index 91f847a6df27..4681b8c2def7 100644
--- a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Template Toolkit
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Template-Toolkit/
 IUSE=xml gd mysql postgres latex vim-syntax test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
 RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.56 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=21b31701a2e9464b178a2ef0a2f1981a
+_md5_=754c573da720a53f70b649d2eb690de0
diff --git a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5 b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
index 6aeab2cc7ffe..5470833e12c5 100644
--- a/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
+++ b/metadata/md5-cache/dev-perl/Test-Needs-0.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=Skip tests when modules not available
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Needs/
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002005.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=a58e9f17376189f3f62dda18de9806f3
+_md5_=a0f0e4bde4cab902f9905d43b5b17229
diff --git a/metadata/md5-cache/dev-perl/TheSchwartz-1.120.0-r1 b/metadata/md5-cache/dev-perl/TheSchwartz-1.120.0-r1
index a26a28799127..6eda15073d68 100644
--- a/metadata/md5-cache/dev-perl/TheSchwartz-1.120.0-r1
+++ b/metadata/md5-cache/dev-perl/TheSchwartz-1.120.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/Data-ObjectDriver-0.06 dev-perl/Module-Build dev-lang/perl:=
 DESCRIPTION=Reliable job queue
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/TheSchwartz/
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/Data-ObjectDriver-0.06 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JF/JFEARN/TheSchwartz-1.12.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=eb96b4177fdd53267fadc662b8973c0f
+_md5_=0118eada17cb108ff378e5e0a28a09b3
diff --git a/metadata/md5-cache/dev-perl/TimeDate-2.300.0 b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
index 9fc3622d9b30..5ba50efea924 100644
--- a/metadata/md5-cache/dev-perl/TimeDate-2.300.0
+++ b/metadata/md5-cache/dev-perl/TimeDate-2.300.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A Date/Time Parsing Perl Module
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/TimeDate/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=233969300bade9d5ed1b5c1c00d60202
+_md5_=9bea5c380c2021b8ebdf4eb29d328a3c
diff --git a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0 b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
index e5a3cc0321f3..0080a1a57a17 100644
--- a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
+++ b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=parser and builder for application/x-www-form-urlencoded
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/WWW-Form-UrlEncoded/
 IUSE=test +xs examples
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter xs? ( >=dev-perl/WWW-Form-UrlEncoded-XS-0.190.0 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=485e1d91d22a4a1627022ab471451f4c
+_md5_=f88527b7bf67da2b9989ffbcbc576503
diff --git a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0 b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
index e10e31f08faf..82f0a4c77d4a 100644
--- a/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
+++ b/metadata/md5-cache/dev-perl/WWW-Form-UrlEncoded-XS-0.240.0
@@ -4,10 +4,10 @@ DESCRIPTION=XS parsing/building of application/x-www-form-urlencoded
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/WWW-Form-UrlEncoded-XS/
 IUSE=test
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-XS-0.24.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=1d0bb7098a655906bf4a979a53db1bd5
+_md5_=c239962109233b3485ddaeeda5883bc3
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index c277e77fe101..32b21d854e81 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.11 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.11
new file mode 100644
index 000000000000..ae79704a7f82
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=6
+HOMEPAGE=https://pecl.php.net/apcu
+IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/apcu-5.1.11.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c2f10da02582163b7b88c19ac5464d3a
diff --git a/metadata/md5-cache/dev-php/pecl-eio-2.0.1 b/metadata/md5-cache/dev-php/pecl-eio-2.0.1
deleted file mode 100644
index 66145d93bbf0..000000000000
--- a/metadata/md5-cache/dev-php/pecl-eio-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=PHP wrapper for libeio library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/eio
-IUSE=debug php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/eio-2.0.1.tgz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7dc90f362668801d5f9ac7d1cc289da1
diff --git a/metadata/md5-cache/dev-php/pecl-eio-2.0.2 b/metadata/md5-cache/dev-php/pecl-eio-2.0.2-r1
index b7ac97798d69..536583eacfe1 100644
--- a/metadata/md5-cache/dev-php/pecl-eio-2.0.2
+++ b/metadata/md5-cache/dev-php/pecl-eio-2.0.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=PHP wrapper for libeio library
 EAPI=6
 HOMEPAGE=https://pecl.php.net/eio
-IUSE=debug php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=debug php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/eio-2.0.2.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d924e599f2debd18f382a314256a17e
+_md5_=2c51a876ce088d1636abefd407915596
diff --git a/metadata/md5-cache/dev-php/pecl-event-2.3.0 b/metadata/md5-cache/dev-php/pecl-event-2.3.0-r1
index fca9715e0de3..aa7fb90d1d75 100644
--- a/metadata/md5-cache/dev-php/pecl-event-2.3.0
+++ b/metadata/md5-cache/dev-php/pecl-event-2.3.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=PHP wrapper for libevent2
 EAPI=6
 HOMEPAGE=https://pecl.php.net/event
-IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~amd64 ~ia64 ~x86
 LICENSE=PHP-3
-RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) !dev-php/pecl-libevent php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) !dev-php/pecl-libevent php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/event-2.3.0.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=92ebbe3fa674a87d9a7abd433bdff692
+_md5_=42d66da498076f4d07042307b6629cbc
diff --git a/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1 b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
new file mode 100644
index 000000000000..7c75c6201c05
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mailparse-3.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) dev-util/re2c >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
+EAPI=6
+HOMEPAGE=https://pecl.php.net/mailparse
+IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/mailparse-3.0.2.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=888dcd01209006bd0df368b3918f2b29
diff --git a/metadata/md5-cache/dev-php/pecl-oauth-2.0.2-r1 b/metadata/md5-cache/dev-php/pecl-oauth-2.0.2-r2
index 638cfd32b5bb..c0120915a8a8 100644
--- a/metadata/md5-cache/dev-php/pecl-oauth-2.0.2-r1
+++ b/metadata/md5-cache/dev-php/pecl-oauth-2.0.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
 EAPI=6
 HOMEPAGE=https://pecl.php.net/oauth
-IUSE=+curl examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=+curl examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php5-6? ( dev-php/pecl-oauth:0[php_targets_php5-6(-)?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php5-6? ( dev-php/pecl-oauth:0[php_targets_php5-6(-)?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/oauth-2.0.2.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bf57a0cad3230fdfce2aa126cbe473cd
+_md5_=768a44481f72f809b8407ef8ca83c1b1
diff --git a/metadata/md5-cache/dev-php/pecl-redis-4.0.0 b/metadata/md5-cache/dev-php/pecl-redis-4.0.0
new file mode 100644
index 000000000000..cbf8de10c58b
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-redis-4.0.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=igbinary? ( php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] ) php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/igbinary[php_targets_php7-2] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=PHP extension for interfacing with Redis
+EAPI=6
+HOMEPAGE=https://pecl.php.net/redis
+IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~arm
+LICENSE=PHP-3.01
+RDEPEND=igbinary? ( php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] ) php_targets_php7-0? ( dev-php/igbinary[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/igbinary[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/igbinary[php_targets_php7-2] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pecl.php.net/get/redis-4.0.0.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ddaa38f3df8b9bafb339d848245603ed
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r2 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r2
deleted file mode 100644
index 9f3e47644b6c..000000000000
--- a/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=RRDtool bindings for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/rrd
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php5-6? ( dev-php/pecl-rrd:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/rrd-2.0.1.tgz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=405d64ecc607b010630654c0c697b0f7
diff --git a/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r3 b/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r3
new file mode 100644
index 000000000000..eac2b1ee1991
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-rrd-2.0.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=RRDtool bindings for PHP
+EAPI=6
+HOMEPAGE=https://pecl.php.net/rrd
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) php_targets_php5-6? ( dev-php/pecl-rrd:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/rrd-2.0.1.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6fcd1a4e277912d91190c297bd1cfa4e
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-2.0.0-r1 b/metadata/md5-cache/dev-php/pecl-stomp-2.0.0-r1
deleted file mode 100644
index 0ddcd7105c3e..000000000000
--- a/metadata/md5-cache/dev-php/pecl-stomp-2.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=PHP extension to communicate with Stomp message brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/stomp
-IUSE=examples ssl test php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php5-6? ( dev-php/pecl-stomp:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/stomp-2.0.0.tgz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0a397778ea02455fb0c311d08ef85940
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-2.0.1 b/metadata/md5-cache/dev-php/pecl-stomp-2.0.1
deleted file mode 100644
index 2d9d56255899..000000000000
--- a/metadata/md5-cache/dev-php/pecl-stomp-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP extension to communicate with Stomp message brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/stomp
-IUSE=examples ssl test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php5-6? ( dev-php/pecl-stomp:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/stomp-2.0.1.tgz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af2e4ac056d930efd015fdf79511e524
diff --git a/metadata/md5-cache/dev-php/pecl-stomp-2.0.1-r1 b/metadata/md5-cache/dev-php/pecl-stomp-2.0.1-r1
new file mode 100644
index 000000000000..85f409c73113
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-stomp-2.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php7-2? ( dev-lang/php:7.1[ssl?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=PHP extension to communicate with Stomp message brokers
+EAPI=6
+HOMEPAGE=https://pecl.php.net/stomp
+IUSE=examples ssl test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php7-2? ( dev-lang/php:7.1[ssl?] ) php_targets_php5-6? ( dev-php/pecl-stomp:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/stomp-2.0.1.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3db976d42672e58a0e1f52e2eb1c25c9
diff --git a/metadata/md5-cache/dev-php/pecl-yaz-1.2.2 b/metadata/md5-cache/dev-php/pecl-yaz-1.2.2-r1
index 79bb7a0e084e..3fbe80a3eb95 100644
--- a/metadata/md5-cache/dev-php/pecl-yaz-1.2.2
+++ b/metadata/md5-cache/dev-php/pecl-yaz-1.2.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/yaz-3.0.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=>=dev-libs/yaz-3.0.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit
 EAPI=6
 HOMEPAGE=https://pecl.php.net/yaz
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/yaz-1.2.2.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=189ed9e2d678f8a4c2966758f3a206fd
+_md5_=1d38351f38cbb241c9e56a2be83274b3
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3-r1 b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
new file mode 100644
index 000000000000..54768658a3be
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/freezegun[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[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Collection of tools for internationalizing Python applications
+EAPI=6
+HOMEPAGE=http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/B/Babel/Babel-2.5.3.tar.gz
+_eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80b9c3a51d381331a72e693b6207a1c0
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index e155c781052c..a9e069c637c4 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/PySocks-1.6.7 b/metadata/md5-cache/dev-python/PySocks-1.6.7
index 447e38600c84..86649af93778 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.6.7
+++ b/metadata/md5-cache/dev-python/PySocks-1.6.7
@@ -4,11 +4,11 @@ DESCRIPTION=SOCKS client module
 EAPI=6
 HOMEPAGE=https://github.com/Anorov/PySocks https://pypi.python.org/pypi/PySocks
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.7.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6aa2ba1f95672eb82c1a771b3168187b
+_md5_=136bf458e5e8e436ae4081c59e79a691
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.24.0 b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
index 129a19b5af2e..328f1409d8ea 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python ASN.1 library with a focus on performance and a pythonic API
 EAPI=6
 HOMEPAGE=https://github.com/wbond/asn1crypto/ https://pypi.python.org/pypi/asn1crypto/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/wbond/asn1crypto/archive/0.24.0.tar.gz -> asn1crypto-0.24.0.gh.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21517c68e4afd5143b42da3db49de461
+_md5_=ca153d45be596d0ea4cbfda9cb5606e1
diff --git a/metadata/md5-cache/dev-python/atom-0.4.1 b/metadata/md5-cache/dev-python/atom-0.4.1
new file mode 100644
index 000000000000..abca5e5dcb06
--- /dev/null
+++ b/metadata/md5-cache/dev-python/atom-0.4.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Memory efficient Python objects
+EAPI=6
+HOMEPAGE=https://github.com/nucleic/atom
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Clear-BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/atom/atom-0.4.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3ddd55aed50087970f8ecf459da3b1be
diff --git a/metadata/md5-cache/dev-python/automat-0.6.0 b/metadata/md5-cache/dev-python/automat-0.6.0
index f302e5a9c6df..ff2affc7addb 100644
--- a/metadata/md5-cache/dev-python/automat-0.6.0
+++ b/metadata/md5-cache/dev-python/automat-0.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Self-service finite-state machines for the programmer on the go
 EAPI=6
 HOMEPAGE=https://github.com/glyph/automat https://pypi.python.org/pypi/Automat
 IUSE=examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.6.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1be2c0da7af20ca12ddecaf87c81fc2b
+_md5_=ce363fc109213bface57c8991e2ba7fc
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.10 b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
index 52b39b4c0654..288557faf973 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=6
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/
 IUSE=test python_targets_pypy python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils:0= dev-python/backports[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4389c7f20cb87583fb7390c9c7d19780
+_md5_=2a04235a14b499746f575734239339c1
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.8 b/metadata/md5-cache/dev-python/backports-lzma-0.0.8
index 1d36db611784..beccab7e8745 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.8
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of Python 3.3's lzma module for XZ/LZMA compressed files
 EAPI=6
 HOMEPAGE=https://github.com/peterjc/backports.lzma/ https://pypi.python.org/pypi/backports.lzma/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=app-arch/xz-utils dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.8.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd1a3ba0c315ebb8c91426bccb4bfbc0
+_md5_=7f921341aff5625266f07c30e50bda5e
diff --git a/metadata/md5-cache/dev-python/cryptography-2.1.4 b/metadata/md5-cache/dev-python/cryptography-2.1.4
index 36717ecb338b..98a0158bfa08 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.1.4
+++ b/metadata/md5-cache/dev-python/cryptography-2.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=6
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=libressl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)] >=dev-libs/openssl-1.1.0g-r1:0 ) ) ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.7:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/idna-2.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/asn1crypto-0.21.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.1.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c69c0938ffeaef7af9be053e6a4ac7a5
+_md5_=1d494b8312412d81e95786bdfd3ce3fe
diff --git a/metadata/md5-cache/dev-python/discogs-client-2.2.1 b/metadata/md5-cache/dev-python/discogs-client-2.2.1
index aac55090721c..2bef4f3a66a0 100644
--- a/metadata/md5-cache/dev-python/discogs-client-2.2.1
+++ b/metadata/md5-cache/dev-python/discogs-client-2.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauthlib[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(-)]
+DEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauth2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Official Python API client for Discogs
 EAPI=5
 HOMEPAGE=https://github.com/discogs/discogs_client https://pypi.python.org/pypi/discogs-client
-IUSE=python_targets_python2_7
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauth2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/oauthlib[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 )
+RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauth2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/discogs-client/discogs-client-2.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58576d4656a4514f74103e9ed85e738c
+_md5_=d3851ad5f42d506c488c06238f5b0483
diff --git a/metadata/md5-cache/dev-python/enaml-0.10.2 b/metadata/md5-cache/dev-python/enaml-0.10.2
new file mode 100644
index 000000000000..01d94c4f38b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/enaml-0.10.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/atom[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/qscintilla-2.10.3 test? ( dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Enthought Tool Suite: framework for writing declarative interfaces
+EAPI=6
+HOMEPAGE=https://github.com/nucleic/enaml https://pypi.python.org/pypi/enaml
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/atom[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/qscintilla-2.10.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/enaml/enaml-0.10.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=405f6b36bfbac08d4d5242d566673f2d
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8 b/metadata/md5-cache/dev-python/gmpy-2.0.8
index 5e5483f8ac9c..5ac583c58c71 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
 EAPI=5
 HOMEPAGE=https://github.com/aleaxit/gmpy
 IUSE=doc mpir python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir ) 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=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f89d80686593ca7417113aae1c9a9a6
+_md5_=b3d544131056990da78f222326edc665
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index 045727018823..d44d290addb5 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pure-Python HPACK header compression
 EAPI=6
 HOMEPAGE=https://python-hyper.org/hpack/en/latest/ https://pypi.python.org/pypi/hpack
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=09efe1a01a5370ccad5de67611395ea0
+_md5_=991347a684f29c1fff8d42b377ba4fcc
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999999999 b/metadata/md5-cache/dev-python/html5lib-0.999999999
index e04f50491a18..67a28320a0f8 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.999999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.999999999
@@ -4,11 +4,11 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=6
 HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/six[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/webencodings[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.999999999.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ab8d0ff084259b15d4146a91164f4b9
+_md5_=3f6a4a0b4a0d4ce0731abc0e588f3ff7
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0.1 b/metadata/md5-cache/dev-python/html5lib-1.0.1
index 47329529cee8..bebc7c9bc0d4 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=6
 HOMEPAGE=https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x64-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.9[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/webencodings[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.0.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c4a9763d432d31308cd4f98ff86637d
+_md5_=a94c770f199f4c0f01bcfd259949a6db
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.0.1 b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
index a4b90a6cb083..80d6336c1b69 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.0.1
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 State-Machine based protocol implementation
 EAPI=6
 HOMEPAGE=https://python-hyper.org/h2/en/stable/ https://pypi.python.org/pypi/h2
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/hyperframe-5.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyperframe-6.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hpack-2.3.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hpack-4.0.0[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.0.1.tar.gz -> hyper-h2-3.0.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f8099c436be278f8afdefa8ce28ffb8
+_md5_=49275765772da88a7e1674133766eb9a
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.1.0 b/metadata/md5-cache/dev-python/hyperframe-5.1.0
index 3fa05e30c7a9..fd5777cddd2f 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.1.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP/2 framing layer for Python
 EAPI=6
 HOMEPAGE=https://python-hyper.org/en/latest/ https://pypi.python.org/pypi/hyperframe
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.1.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8563723b7eacd87bae52c23a588dcd54
+_md5_=d6b330be4936c3b4b774809c5c6a4823
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.3.1 b/metadata/md5-cache/dev-python/hyperlink-17.3.1
index e1f7662ca3bf..c6a00d0a9457 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.3.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=A featureful, correct URL for Python
 EAPI=6
 HOMEPAGE=https://github.com/python-hyper/hyperlink https://pypi.python.org/pypi/hyperlink
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=BSD MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.3.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e94555f7e42ad3452b230056f7c7a145
+_md5_=2f5d11591a4700ed538650fec4caeb0f
diff --git a/metadata/md5-cache/dev-python/idna-2.6 b/metadata/md5-cache/dev-python/idna-2.6
index 9afeb7b63690..0d05301ef3dc 100644
--- a/metadata/md5-cache/dev-python/idna-2.6
+++ b/metadata/md5-cache/dev-python/idna-2.6
@@ -4,11 +4,11 @@ DESCRIPTION=Internationalized Domain Names in Applications (IDNA)
 EAPI=6
 HOMEPAGE=https://github.com/kjd/idna https://pypi.python.org/pypi/idna
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-solaris ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.6.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4face132138190fd04719d6cbdb10846
+_md5_=4f42ea16dc7b92fa8adc85eb3e92822d
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.19 b/metadata/md5-cache/dev-python/ipaddress-1.0.19
index 6cf95bb2e536..4da0830ada1f 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.19
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.19
@@ -4,11 +4,11 @@ DESCRIPTION=IPv4/IPv6 manipulation library, backport of the ipaddress module
 EAPI=6
 HOMEPAGE=https://github.com/phihag/ipaddress
 IUSE=python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.19.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5ef4ee24326c0f1c67f12b29edd7095
+_md5_=f0a42f0bee020ae21ddc1c45d89d798d
diff --git a/metadata/md5-cache/dev-python/keyring-12.0.0 b/metadata/md5-cache/dev-python/keyring-12.0.1
index db138124843a..c89f9e806c7d 100644
--- a/metadata/md5-cache/dev-python/keyring-12.0.0
+++ b/metadata/md5-cache/dev-python/keyring-12.0.1
@@ -9,6 +9,6 @@ LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=mirror://pypi/k/keyring/keyring-12.0.0.tar.gz
+SRC_URI=mirror://pypi/k/keyring/keyring-12.0.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2b4e96ab457e4ed220689b98cc6eb045
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.3 b/metadata/md5-cache/dev-python/libpillowfight-0.2.3
new file mode 100644
index 000000000000..b44ccb543618
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Small library containing various image processing algorithms
+EAPI=6
+HOMEPAGE=https://github.com/openpaperwork/libpillowfight
+IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pillow[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(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/openpaperwork/libpillowfight/archive/0.2.3.tar.gz -> libpillowfight-0.2.3.tar.gz
+_eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e2349c6983ef7451a080456a791b9a4
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.12 b/metadata/md5-cache/dev-python/m2r-0.1.12
index 4a0340e96e74..18b510b1f21e 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.12
+++ b/metadata/md5-cache/dev-python/m2r-0.1.12
@@ -4,11 +4,11 @@ DESCRIPTION=Markdown to reStructuredText converter
 EAPI=6
 HOMEPAGE=https://github.com/miyakogi/m2r https://pypi.python.org/pypi/m2r
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/mistune[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.12.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef0adcfb196ef898c255e2753817ee58
+_md5_=8bd1e3f7ab0d63c3194250f5ade8b976
diff --git a/metadata/md5-cache/dev-python/mistune-0.7.4 b/metadata/md5-cache/dev-python/mistune-0.7.4
index dcac6b39f99d..5317ff9bf149 100644
--- a/metadata/md5-cache/dev-python/mistune-0.7.4
+++ b/metadata/md5-cache/dev-python/mistune-0.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=The fastest markdown parser in pure Python
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.7.4.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd68ab56f75718592feaff373db5af69
+_md5_=f930d95b1aa48fa7f138c799961ed7f3
diff --git a/metadata/md5-cache/dev-python/ovs-2.7.2 b/metadata/md5-cache/dev-python/ovs-2.7.2
index 08efe1dbfd1f..20967f15c36c 100644
--- a/metadata/md5-cache/dev-python/ovs-2.7.2
+++ b/metadata/md5-cache/dev-python/ovs-2.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=OVS bindings for python.
 EAPI=6
 HOMEPAGE=https://github.com/openvswitch/ovs/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.7.2.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=893af13fdc5bb2d4ae547051d68e37a1
+_md5_=d36bb712ba9e00b5e93ae16823b282d8
diff --git a/metadata/md5-cache/dev-python/owslib-0.16.0 b/metadata/md5-cache/dev-python/owslib-0.16.0
index 90db73051e36..c57cb5209697 100644
--- a/metadata/md5-cache/dev-python/owslib-0.16.0
+++ b/metadata/md5-cache/dev-python/owslib-0.16.0
@@ -4,7 +4,7 @@ DESCRIPTION=Library for client programming with Open Geospatial Consortium web s
 EAPI=6
 HOMEPAGE=https://geopython.github.io/OWSLib
 IUSE=test python_targets_python2_7 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-python/pyproj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/elementtree[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.16.0.tar.gz -> owslib-0.16.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd3e36c60ea1b3d4844503c10e81c652
+_md5_=fc00e7c7aa5cc35537c47fce12a0fb65
diff --git a/metadata/md5-cache/dev-python/pandas-9999 b/metadata/md5-cache/dev-python/pandas-9999
index 2ac6199bd50b..c1123463f9a5 100644
--- a/metadata/md5-cache/dev-python/pandas-9999
+++ b/metadata/md5-cache/dev-python/pandas-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/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/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg: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(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=6
 HOMEPAGE=http://pandas.pydata.org/
-IUSE=doc -minimal full-support test X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=doc full-support minimal test X python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
 LICENSE=BSD
-RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/statsmodels[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyside[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !<dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/openpyxl-1.9.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !minimal? ( dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) full-support? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=672ed03abb685f00aeadf9137b391040
+_md5_=5f13f64a1ba2913d3e4acbd8c26f01d3
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 1824c3beabb6..af1931e4f56c 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A pure-Python implementation of the HTTP/2 priority tree
 EAPI=6
 HOMEPAGE=https://python-hyper.org/priority/en/latest/ https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0dd984fc1262e359dd5ace72506019bf
+_md5_=14eaef97add03a14c09c3faf3b6a4e28
diff --git a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1 b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
index 58b277b4c265..4a7a6eef75ea 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
+++ b/metadata/md5-cache/dev-python/pycairo-1.16.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=6
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.16.3/pycairo-1.16.3.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=244c4244a05a333fd5dccca14c37768a
+_md5_=fc39e7cb7d77cf2f38e565e9af5bd673
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index 54a539292f4c..db78966dae53 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.1
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cffi-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/libsodium:0/23 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/hypothesis-3.27.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/pytest-3.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python binding to the Networking and Cryptography (NaCl) library
 EAPI=6
 HOMEPAGE=https://github.com/pyca/pynacl/ https://pypi.python.org/pypi/PyNaCl/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.1.tar.gz -> pynacl-1.2.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40f68eb4b2e2fd6bb4a4c6ab38f70399
+_md5_=77805f07326b65ce99e815ded81c53a9
diff --git a/metadata/md5-cache/dev-python/pyproj-1.9.5.1 b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
index 7ba759aa5b75..b27636de1c18 100644
--- a/metadata/md5-cache/dev-python/pyproj-1.9.5.1
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to PROJ.4 library
 EAPI=6
 HOMEPAGE=https://github.com/jswhit/pyproj
 IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20a9ad4d7cbc812039ab9a30eaa1e8ff
+_md5_=b7a9b49fac14aae40aabb1a85a5529ff
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.3 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.3
index d0c4f75f5554..d739d7b7baa4 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.10.3
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Qscintilla
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=debug python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.10.3:=
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.3.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=46f480c346760e0a6cc13a40bb3418b3
+_md5_=c92a68ce571223c4b5daa80875de5431
diff --git a/metadata/md5-cache/dev-python/rarfile-3.0 b/metadata/md5-cache/dev-python/rarfile-3.0
index 1cde2aa8acd7..59f1a8a0f18f 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.0
+++ b/metadata/md5-cache/dev-python/rarfile-3.0
@@ -4,11 +4,11 @@ DESCRIPTION=Module for RAR archive reading
 EAPI=6
 HOMEPAGE=https://github.com/markokr/rarfile
 IUSE=+compressed python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rarfile/rarfile-3.0.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c2ab150262063da7fbe2daba43a7207
+_md5_=4c29fe7dbf75c1b8c549e0bd9df2f0f2
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.2 b/metadata/md5-cache/dev-python/robotframework-3.0.2
index a7d0c2d76362..39a291b0d09a 100644
--- a/metadata/md5-cache/dev-python/robotframework-3.0.2
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Test automation framework for acceptance testing & test-driven development
 EAPI=6
 HOMEPAGE=http://robotframework.org/ https://pypi.python.org/pypi/robotframework/
-IUSE=python_targets_python2_7
+IUSE=python_targets_python2_7 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotframework/robotframework-3.0.2.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c58f8e8982749a99242e7cbc2a05894b
+_md5_=03dec0b536cda91fd20d8f537799f0d2
diff --git a/metadata/md5-cache/dev-python/service_identity-17.0.0-r1 b/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
index 56543a4ffb30..ab88fb26627c 100644
--- a/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
+++ b/metadata/md5-cache/dev-python/service_identity-17.0.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Service identity verification for pyOpenSSL
 EAPI=5
 HOMEPAGE=https://github.com/pyca/service_identity
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux
 LICENSE=MIT
 RDEPEND=dev-python/pyasn1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyasn1-modules[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[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(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pyca/service_identity/archive/17.0.0.tar.gz -> service_identity-17.0.0.gh.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e4f43282601b769b6c938082e3776e8d
+_md5_=c684e212703995fb7b0cd81b882e5cc6
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
index 358e3393fd5a..7fc7169aee1a 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced Sphinx theme (based on Python 3 docs)
 EAPI=6
 HOMEPAGE=https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.python.org/pypi/sphinx-py3doc-enhanced-theme
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=009a7263c324121e90d7e975ab037788
+_md5_=3a684d27f94512d3d53ee4c396bb5243
diff --git a/metadata/md5-cache/dev-python/twisted-17.9.0 b/metadata/md5-cache/dev-python/twisted-17.9.0
index 4d056832cf98..410388a7bf87 100644
--- a/metadata/md5-cache/dev-python/twisted-17.9.0
+++ b/metadata/md5-cache/dev-python/twisted-17.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=An asynchronous networking framework written in Python
 EAPI=5
 HOMEPAGE=http://www.twistedmatrix.com/
 IUSE=conch crypt http2 serial +soap test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/incremental-16.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/zope-interface-4.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] conch? ( dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/service_identity[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) serial? ( >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) soap? ( python_targets_python2_7? ( dev-python/soappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) http2? ( >=dev-python/hyper-h2-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/hyper-h2-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/priority-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/priority-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/constantly-15.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/automat-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/hyperlink-17.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !dev-python/twisted-core !dev-python/twisted-conch !dev-python/twisted-lore !dev-python/twisted-mail !dev-python/twisted-names !dev-python/twisted-news !dev-python/twisted-pair !dev-python/twisted-runner !dev-python/twisted-words !dev-python/twisted-web python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://twistedmatrix.com/Releases/Twisted/17.9/Twisted-17.9.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f734d3cadc6183253ad04de925b53cd0
+_md5_=4f583ec691d7ad5b63e03f2c074fb3fd
diff --git a/metadata/md5-cache/dev-python/urllib3-1.22 b/metadata/md5-cache/dev-python/urllib3-1.22
index 8dfba85c5da4..60eb4b560f65 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.22
+++ b/metadata/md5-cache/dev-python/urllib3-1.22
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library with thread-safe connection pooling, file post, and mor
 EAPI=6
 HOMEPAGE=https://github.com/shazow/urllib3
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/PySocks-1.5.6[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/PySocks-1.5.7[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/PySocks-2.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/certifi[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/cryptography-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.14[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/idna-2.0.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(-)] virtual/python-ipaddress[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.22.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c064dca96c99951a6f056b37be32bf3c
+_md5_=82719011408c630f29ab0b13be7592d0
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1 b/metadata/md5-cache/dev-python/webencodings-0.5.1
index 3d4ab360128a..723342db8256 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Character encoding aliases for legacy web content
 EAPI=6
 HOMEPAGE=https://github.com/SimonSapin/python-webencodings https://pypi.python.org/pypi/webencodings
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/w/webencodings/webencodings-0.5.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94dc8af0ad918e2515378620314f3420
+_md5_=bd41ea4dae8ee770c2cbcb8e8dbe89ed
diff --git a/metadata/md5-cache/dev-python/xapp-1.0.1-r2 b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
index 763c406d2170..84ded3b805ef 100644
--- a/metadata/md5-cache/dev-python/xapp-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/xapp-1.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for x11-libs/xapps
 EAPI=6
 HOMEPAGE=https://github.com/linuxmint/python-xapp
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[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(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python-xapp/archive/1.0.1.tar.gz -> xapp-1.0.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3179783684fb2e6e949db7814db02cd0
+_md5_=09c85bfa559832025a9da43eaa62409d
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index b1348af62573..56db9d0b0e2c 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/actionlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
new file mode 100644
index 000000000000..59fd999d2b54
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 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(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Actionlib tutorials
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/actionlib_tutorials
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d44304a075715ff6392544dd01ed9eeb
diff --git a/metadata/md5-cache/ros-meta/desktop-1.3.0 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
index eb5ca633a716..81a8983f7aae 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.3.0
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for a basic ROS desktop install
+DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 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=Nodelet tutorial
 EAPI=5
-HOMEPAGE=http://wiki.ros.org/desktop
+HOMEPAGE=http://wiki.ros.org/nodelet_tutorial_math
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01cd73fcbe8856c982f989b3adc655e6
+_md5_=f42e05223aab004528dbee3af6382a39
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.5.4 b/metadata/md5-cache/dev-ros/pcl_ros-1.5.4
new file mode 100644
index 000000000000..83f5eb2c6982
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 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=PCL (Point Cloud Library) ROS interface stack
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pcl_ros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.4.tar.gz -> perception_pcl-1.5.4.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd8e1db59c430ec128c068ff6ee38854
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
new file mode 100644
index 000000000000..13661a8b26c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 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=Pluginlib tutorials
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/pluginlib_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2abe9f32d2506f90132a002bc43b5ed4
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.3.0 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0
index e4697d9f5321..1e0ce1629d5b 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.3.0
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for ROS complete desktop install
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 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=Allows to export rosbag migration rule files without depending on rosbag
 EAPI=5
-HOMEPAGE=http://wiki.ros.org/desktop_full
+HOMEPAGE=http://wiki.ros.org/rosbag_migration_rule
 IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators 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=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
+SRC_URI=https://github.com/ros/rosbag_migration_rule/archive/1.0.0.tar.gz -> rosbag_migration_rule-1.0.0.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4af2fc71fa081bb2b03744c57a277181
+_md5_=4dff4f7b9d418487e9250fa4751dff30
diff --git a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999 b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
new file mode 100644
index 000000000000..442cf5fb6267
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=Allows to export rosbag migration rule files without depending on rosbag
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rosbag_migration_rule
+IUSE=python_targets_python2_7 test
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4dff4f7b9d418487e9250fa4751dff30
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
new file mode 100644
index 000000000000..38a4dcb06c7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 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(-)] 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/turtle_actionlib
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= 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(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8a9a0105420be7fe1ed8c0eb1a6c51b0
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d318fb603ae9..c55aab41c221 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/coolio-1.5.3 b/metadata/md5-cache/dev-ruby/coolio-1.5.3
index 3f1222b0d7cf..63ae2e6fc8d0 100644
--- a/metadata/md5-cache/dev-ruby/coolio-1.5.3
+++ b/metadata/md5-cache/dev-ruby/coolio-1.5.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A high performance event framework for Ruby which uses the libev C library
 EAPI=6
 HOMEPAGE=https://coolio.github.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/iobuffer-1[ruby_targets_ruby25] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/cool.io-1.5.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9443df8143ad0f805d794f3a8e3bbf0f
+_md5_=821a46d0b7812bd405b98c45a1731ea6
diff --git a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1 b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
index 447533d1d65c..fc75f575a258 100644
--- a/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
+++ b/metadata/md5-cache/dev-ruby/http_parser_rb-0.6.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=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_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Simple callback-based HTTP request/response parser
 EAPI=5
 HOMEPAGE=https://github.com/tmm1/http_parser.rb
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/http_parser.rb-0.6.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4973927e834b9c20ab41f8e9c4c50966
+_md5_=0e1e96221c0f69e4c9479bcadfe5829c
diff --git a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3 b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
index 26ab094fe6b2..0642832be635 100644
--- a/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
+++ b/metadata/md5-cache/dev-ruby/iobuffer-1.1.2-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=IO::Buffer is a byte queue which is intended for non-blocking I/O applications
 EAPI=5
 HOMEPAGE=https://github.com/tarcieri/iobuffer
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
 KEYWORDS=~amd64 ~x86 ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/tarcieri/iobuffer/tarball/v1.1.2 -> iobuffer-git-1.1.2.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c44e5f115d66a7f14298735fb29da683
+_md5_=f2ccb5364d83a9383dcb526800e6ed58
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.5.0 b/metadata/md5-cache/dev-ruby/mocha-1.5.0
new file mode 100644
index 000000000000..6ba8aadee461
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-1.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] dev-ruby/introspection[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] dev-ruby/introspection[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ) 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_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
+EAPI=6
+HOMEPAGE=http://gofreerange.com/mocha/docs/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1.0
+SRC_URI=mirror://rubygems/mocha-1.5.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=6ca0b70a8f4c83ec030675e41fdda738
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.2.4 b/metadata/md5-cache/dev-ruby/msgpack-1.2.4
index 482ca3db007a..f592c280af70 100644
--- a/metadata/md5-cache/dev-ruby/msgpack-1.2.4
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Binary-based efficient data interchange format for ruby binding
 EAPI=6
 HOMEPAGE=https://msgpack.org/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/msgpack-1.2.4.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f238f4013d2ba257d74034098a516af2
+_md5_=5c0c245c7b5b56d983cf84479f74e62a
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
new file mode 100644
index 000000000000..292e1e3dde59
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) test? ( ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
+EAPI=6
+HOMEPAGE=https://github.com/cryptosphere/rbnacl
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=4
+SRC_URI=mirror://rubygems/rbnacl-4.0.2.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c9bf23cf5bfc024a0bb7ed6a5e600d65
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-5.0.0-r1 b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0-r1
new file mode 100644
index 000000000000..5fa68745146c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-5.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) test? ( ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
+EAPI=6
+HOMEPAGE=https://github.com/cryptosphere/rbnacl
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-ruby/ffi[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/ffi[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/ffi[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/ffi[ruby_targets_ruby25] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5
+SRC_URI=mirror://rubygems/rbnacl-5.0.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=d73fd23362958782fde4b802f2cbd995
diff --git a/metadata/md5-cache/dev-ruby/roadie-3.3.0 b/metadata/md5-cache/dev-ruby/roadie-3.3.0
new file mode 100644
index 000000000000..50488cb4ee1b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/roadie-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby22] dev-ruby/webmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby23] dev-ruby/webmock[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec-collection_matchers[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] ) ) ruby_targets_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/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( 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=Making HTML emails comfortable for the Rails rockstars
+EAPI=6
+HOMEPAGE=https://github.com/Mange/roadie
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby22] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby22] =dev-ruby/css_parser-1*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby23] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby23] =dev-ruby/css_parser-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby24] >=dev-ruby/css_parser-1.4.5[ruby_targets_ruby24] =dev-ruby/css_parser-1*[ruby_targets_ruby24] ) ruby_targets_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/Mange/roadie/archive/v3.3.0.tar.gz -> roadie-3.3.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=2dbfecfb4d54959bce0886d5e1b767ce
diff --git a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5 b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
index c31df06f3656..ae38e2962e79 100644
--- a/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
+++ b/metadata/md5-cache/dev-ruby/tzinfo-1.2.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( sys-libs/timezone-data ) test? ( ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25] ) ) 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_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Daylight-savings aware timezone library
 EAPI=6
 HOMEPAGE=https://tzinfo.github.io/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=sys-libs/timezone-data ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/thread_safe-0.1:0[ruby_targets_ruby25] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=1
 SRC_URI=mirror://rubygems/tzinfo-1.2.5.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=794687b7aedf2ad65b15c3c64bfb3a56
+_md5_=4320586b2fef234fc0b8c98baf373d15
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.1 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.1
index 1bfa5403646d..578dd24ef0aa 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.1
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec: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] ) )
+DEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=6
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=dev-libs/yajl ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/yajl-ruby-1.3.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1c40041d7b974c726e8bab376a21c8ba
+_md5_=95f65f74f43f282b9cfd0bf88a6556c8
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 08fb503c1106..2c18ba6554c1 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91 b/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
index c85c9ab4fe77..120f231af1fd 100644
--- a/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
+++ b/metadata/md5-cache/dev-scheme/guile-cairo-1.9.91
@@ -4,10 +4,10 @@ DESCRIPTION=Wraps the Cairo graphics library for Guile Scheme
 EAPI=4
 HOMEPAGE=http://www.nongnu.org/guile-cairo/
 IUSE=static-libs test
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-scheme/guile-1.8 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/guile-cairo/guile-cairo-1.9.91.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d69f7696286420ae125eea05f81fd88f
+_md5_=8bbc8e98d10b76d2c282c6938438f3ce
diff --git a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1 b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
index f977adcaa984..dab8bb380e2c 100644
--- a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
+++ b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/guile-gnome/
 IUSE=static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56d0dd9c892ffcf49995cb3421d157fa
+_md5_=177ac98d6cd2ab4969d4e2d55700f409
diff --git a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2 b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
index 8eba1f843c61..a4b2fe8cf513 100644
--- a/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
+++ b/metadata/md5-cache/dev-scheme/guile-gnome-platform-2.16.2
@@ -4,11 +4,11 @@ DESCRIPTION=Guile Scheme code that wraps the GNOME developer platform
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/guile-gnome/
 IUSE=static-libs
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk >=dev-libs/g-wrap-1.9.14 dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b2e909002e467a3ddbe9b841133fde1
+_md5_=64f39a1a2cb2aba6e7a82b0c0f47c2d2
diff --git a/metadata/md5-cache/dev-scheme/guile-gui-0.2-r1 b/metadata/md5-cache/dev-scheme/guile-gui-0.2-r1
index 2feba7e6f608..02a862189304 100644
--- a/metadata/md5-cache/dev-scheme/guile-gui-0.2-r1
+++ b/metadata/md5-cache/dev-scheme/guile-gui-0.2-r1
@@ -3,9 +3,9 @@ DEPEND=dev-scheme/guile x11-libs/guile-gtk
 DESCRIPTION=Guile Scheme code that aims to implement a graphical user interface
 EAPI=6
 HOMEPAGE=http://www.ossau.uklinux.net/guile/
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-scheme/guile x11-libs/guile-gtk
 SLOT=0
 SRC_URI=http://www.ossau.uklinux.net/guile/guile-gui-0.2.tar.gz
-_md5_=b4643663c67e7d3aaed4feb41e504e72
+_md5_=77babca708d432b8816a31a3f26601ba
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index b861e38de626..c88999a061b4 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4 b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
index 924b1bb23282..6be54c0e43dd 100644
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=LaTeX package to use CJK (Chinese/Japanese/Korean) scripts in variou
 EAPI=4
 HOMEPAGE=http://cjk.ffii.org/
 IUSE=doc emacs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-libs/kpathsea emacs? ( virtual/emacs ) virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4.tar.gz mirror://gentoo/cjk-4.8.4-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4-doc.tar.gz )
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cea9cb02840aa594e3297b6fadb812cc
+_md5_=c645da15ac72f7a1c98f37f884a45bd2
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
index b9df350bb1c5..14c4a2b5ebfa 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=4
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
 IUSE=java elibc_FreeBSD java
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2017-02-05.tar.xz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	latex-package	79acad19b9efeec616d0ad70cd117b03	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d8d80dabcc04ef1ae7d4a116923d0d51
+_md5_=8492b32c6c43b6b29fdfc04ec1f7ac31
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 05e7198a475c..7b8420606436 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/android-studio-3.1.0.16.173.4670197 b/metadata/md5-cache/dev-util/android-studio-3.1.0.16.173.4670197
new file mode 100644
index 000000000000..cca72ddb84ab
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-3.1.0.16.173.4670197
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.1.0.16/android-studio-ide-173.4670197-linux.zip
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=3e0b16aba1ecad4b1b7a465dc34e5483
diff --git a/metadata/md5-cache/dev-util/clinfo-2.2.18.04.06 b/metadata/md5-cache/dev-util/clinfo-2.2.18.04.06
new file mode 100644
index 000000000000..5f33d204700b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clinfo-2.2.18.04.06
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+DESCRIPTION=A tool to display info about the system's OpenCL capabilities
+EAPI=6
+HOMEPAGE=https://github.com/Oblomov/clinfo
+KEYWORDS=~amd64
+LICENSE=CC0-1.0
+RDEPEND=>=app-eselect/eselect-opencl-1.1.0-r4 virtual/opencl
+SLOT=0
+SRC_URI=https://github.com/Oblomov/clinfo/archive/2.2.18.04.06.tar.gz -> clinfo-2.2.18.04.06.tar.gz
+_md5_=5c7f85382c06fc156aed219cc3948351
diff --git a/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14 b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14
new file mode 100644
index 000000000000..deb487ac8fd9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-expressions-5.0.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) 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_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) 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_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=a simpler alternative to Regular Expressions
+EAPI=6
+HOMEPAGE=https://github.com/cucumber/cucumber-expressions-ruby#readme
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5.0
+SRC_URI=mirror://rubygems/cucumber-expressions-5.0.14.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=35cbe6f0e967493df48158226c99458d
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-3.9 b/metadata/md5-cache/dev-util/include-what-you-use-3.9
deleted file mode 100644
index 0a2dcf7f9915..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==sys-devel/llvm-3.9* =sys-devel/clang-3.9* python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==sys-devel/llvm-3.9* =sys-devel/clang-3.9* python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://include-what-you-use.org/downloads/include-what-you-use-0.7.src.tar.gz -> include-what-you-use-3.9.src.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1a8501b1c5cd78fa57348611c745aef
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-4.0 b/metadata/md5-cache/dev-util/include-what-you-use-4.0
deleted file mode 100644
index dcdd1bf6dac4..000000000000
--- a/metadata/md5-cache/dev-util/include-what-you-use-4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND==sys-devel/llvm-4.0* =sys-devel/clang-4.0* python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Find unused include directives in C/C++ programs
-EAPI=6
-HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==sys-devel/llvm-4.0* =sys-devel/clang-4.0* python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_4.0.tar.gz -> include-what-you-use-4.0.src.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1ccffe84fb519fa7b2796112db5e875
diff --git a/metadata/md5-cache/dev-util/meson-0.45.1 b/metadata/md5-cache/dev-util/meson-0.45.1
index 0f78c023a244..7b5e67c262a1 100644
--- a/metadata/md5-cache/dev-util/meson-0.45.1
+++ b/metadata/md5-cache/dev-util/meson-0.45.1
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.45.1.tar.gz
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ded18564f077d05b50419001a5857217
+_md5_=b187fca809db4031d8fb075fc3e24253
diff --git a/metadata/md5-cache/dev-util/scons-2.5.1 b/metadata/md5-cache/dev-util/scons-2.5.1
index 37fec43a984c..87b7471ac085 100644
--- a/metadata/md5-cache/dev-util/scons-2.5.1
+++ b/metadata/md5-cache/dev-util/scons-2.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible Python-based build utility
 EAPI=6
 HOMEPAGE=http://www.scons.org/
 IUSE=doc python_targets_pypy python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~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=python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-2.5.1.tar.gz doc? ( http://www.scons.org/doc/2.5.1/PDF/scons-user.pdf -> scons-2.5.1-user.pdf http://www.scons.org/doc/2.5.1/HTML/scons-user.html -> scons-2.5.1-user.html )
 _eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=707998064a929f6ae1f07695189e3645
+_md5_=40dd3e4790a7695b6e72c098b199907a
diff --git a/metadata/md5-cache/dev-util/strace-4.22 b/metadata/md5-cache/dev-util/strace-4.22
new file mode 100644
index 000000000000..7005a5a45be9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-4.22
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/strace/
+IUSE=aio perl static unwind
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) ) perl? ( dev-lang/perl )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v4.22/strace-4.22.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2efa374322d47a88d6de608472f3855d
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3d8be23650ed..c60dee180250 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/subversion-1.10.0_rc1 b/metadata/md5-cache/dev-vcs/subversion-1.10.0_rc2
index fbe3c7560a60..bd679659f710 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.0_rc1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.0_rc2
@@ -8,6 +8,6 @@ LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
 SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.10.0-rc1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
+SRC_URI=mirror://apache/subversion/subversion-1.10.0-rc2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	depend.apache	0917334d570e07f9743a04ff85b3bf1b	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f164a6f0252d599ca1115a60f98ee37
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 89a45f2f56ef..0e56c63fcc92 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
index cebeb9b1c5af..8b570a4aca40 100644
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gnome-shell
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2485272f2fb373acdfb3b0043c7ec991
+_md5_=7e4db6deeced9608d1f90462e8f7eca5
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
index fc9f44af89d0..74ea1c870fde 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
 EAPI=6
 HOMEPAGE=http://developer.linuxmint.com/
 IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=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] ) >=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(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-3.6 >=gnome-extra/cinnamon-control-center-3.6 >=gnome-extra/cinnamon-screensaver-3.6 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aee68531409d8087707505097f4c061a
+_md5_=818c1c857cc1414e9208f9e234face76
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
index 9d48e43d51d6..d65a1e30bb35 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-3.6.5
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamons's main interface to configure various aspects of the deskt
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord +cups debug input_devices_wacom systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c01fcf54f303c602930f7906407f1be3
+_md5_=ce511f00054489ddb05d47fd45f770b0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
index 035a9182dded..475746493e44 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection systemd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0/4
 SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12003b1c90144d230a6b4b5895cd0f67
+_md5_=06c46b0b444c7fce9e2969f0ff1bb647
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0 b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
index aca7fa7b0568..31e97d6d53d5 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-menus-3.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=debug +introspection
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d78ad126b76bacb024688e57eefb7c2d
+_md5_=b0859d841e3a6c3030903ff4491167a5
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
index 8e2cc3396eef..3c47e14607cd 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=debug doc pam systemd xinerama python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4725577e4153fd77406aa40721aeed93
+_md5_=60666f66e11aacdeefaace209a11e6ca
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4 b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
index 389313724af1..2cb135aa8e4a 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
+++ b/metadata/md5-cache/gnome-extra/cinnamon-session-3.6.1-r4
@@ -4,10 +4,10 @@ DESCRIPTION=Cinnamon session manager
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=doc ipv6 systemd
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind[policykit] )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef2385dea5cadc7c32d5fbf74f668c18
+_md5_=fb10f147aa3d3ae962b819e4b56e6078
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
index 7b6d83e1a1c0..43ea0d120a2b 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cinnamon's settings daemon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+colord cups input_devices_wacom smartcard systemd test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b1a44707bc224842ffd4923106ff642
+_md5_=0fdced57126d18e72196ffe86152eff0
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3 b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
index 7275e377c412..74345a2fa19b 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-translations-3.6.3
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Translation data for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
 _eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=20674868b7677e8baff6dc46a1089c26
+_md5_=8968a0f220f2b7bb2046d3a094656557
diff --git a/metadata/md5-cache/gnome-extra/cjs-3.6.1 b/metadata/md5-cache/gnome-extra/cjs-3.6.1
index 0095aa357406..434d702abfc0 100644
--- a/metadata/md5-cache/gnome-extra/cjs-3.6.1
+++ b/metadata/md5-cache/gnome-extra/cjs-3.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+cairo examples gtk test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) !<gnome-extra/cinnamon-2.4
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=63d8c39be1397566a846ee99e308f651
+_md5_=d9cfe7c2eac15135a539264cdc23d905
diff --git a/metadata/md5-cache/gnome-extra/nemo-3.6.4 b/metadata/md5-cache/gnome-extra/nemo-3.6.4
index 7346c8099aa2..23b9d1c65a1e 100644
--- a/metadata/md5-cache/gnome-extra/nemo-3.6.4
+++ b/metadata/md5-cache/gnome-extra/nemo-3.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=exif +introspection +nls packagekit tracker xmp test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1
 PDEPEND=>=gnome-base/gvfs-0.1.2
 RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2379a366155e615d6bbaef454da06a0b
+_md5_=f81568267631d37b4327e99e1c019a3f
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 03b86e25b120..9a199bebcfc9 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701 b/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
deleted file mode 100644
index dfa7b33180ab..000000000000
--- a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-calendar-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/akonadi-notes-14.12.0:5 >=kde-apps/akonadi-search-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 >=kde-apps/kldap-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-apps/kontactinterface-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/boost test? ( >=kde-apps/akonadi-14.12.0:5[tools] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Getting things done application by KDE
-EAPI=6
-HOMEPAGE=https://zanshin.kde.org/
-IUSE=test debug test
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-calendar-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/akonadi-notes-14.12.0:5 >=kde-apps/akonadi-search-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 >=kde-apps/kldap-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-apps/kontactinterface-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-14.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/zanshin-0.4.1_p20170701.tar.xz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=33cbc428c8de0d683b239e8e0533f56f
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.0 b/metadata/md5-cache/kde-misc/zanshin-0.5.0
index a5ffe8d08443..e8c9ca54127d 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.5.0
+++ b/metadata/md5-cache/kde-misc/zanshin-0.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Getting things done application by KDE
 EAPI=6
 HOMEPAGE=https://zanshin.kde.org/
 IUSE=test debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.0:5 >=kde-apps/akonadi-calendar-17.12.0:5 >=kde-apps/akonadi-contacts-17.12.0:5 >=kde-apps/akonadi-notes-17.12.0:5 >=kde-apps/akonadi-search-17.12.0:5 >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 >=kde-apps/kidentitymanagement-17.12.0:5 >=kde-apps/kldap-17.12.0:5 >=kde-apps/kmime-17.12.0:5 >=kde-apps/kontactinterface-17.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.0.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37cdb146623439b74df3b7d049b62efe
+_md5_=2f4a30809cd69d11747b27212f703598
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index ed1f9946ff3b..683fc762327a 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.4-r1 b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
index 11e29e81ffa9..372bb2d445db 100644
--- a/metadata/md5-cache/mail-client/mutt-1.9.4-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.9.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
 EAPI=6
 HOMEPAGE=http://www.mutt.org/
 IUSE=berkdb crypt debug doc gdbm gnutls gpg gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls nntp notmuch pgp_classic pop qdbm +sasl selinux slang smime smime_classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
 SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.4-patches-r1.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5f65696d078bf8e4e07e0e14f43b853
+_md5_=fd647246ca673c6f788c5d8740fcf3e3
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index d54831cdc7e3..93bffb48e6b2 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3 b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
index 7426a796f19f..a32338b6cdbb 100644
--- a/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
+++ b/metadata/md5-cache/media-fonts/kochi-substitute-20030809-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Kochi Japanese TrueType fonts with Wadalab Fonts
 EAPI=0
 HOMEPAGE=http://efont.sourceforge.jp/
 IUSE=X
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=free-noncomm
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/efont/5411/kochi-substitute-20030809.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=903968ceb60994bfa247e23e894ae8f6
+_md5_=d9eeb0b63bf20bbca33524e632ada993
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index ec70cf354d34..781e96404f5b 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/dawn-3.90b-r1 b/metadata/md5-cache/media-gfx/dawn-3.90b-r1
index 8a1218114f33..12093ec55dd0 100644
--- a/metadata/md5-cache/media-gfx/dawn-3.90b-r1
+++ b/metadata/md5-cache/media-gfx/dawn-3.90b-r1
@@ -4,10 +4,10 @@ DESCRIPTION=3D geometrical postscript renderer
 EAPI=6
 HOMEPAGE=http://geant4.kek.jp/~tanaka/DAWN/About_DAWN.html
 IUSE=doc opengl X
-KEYWORDS=amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=public-domain
 RDEPEND=dev-lang/tk:* opengl? ( virtual/opengl ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://geant4.kek.jp/~tanaka/src/dawn_3_90b.tgz
 _eclasses_=eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6e806dd04698c438b474e794d08992b0
+_md5_=537fb587499bfc62c37401e0d0c326f3
diff --git a/metadata/md5-cache/media-gfx/qosmic-1.5.0 b/metadata/md5-cache/media-gfx/qosmic-1.5.0
deleted file mode 100644
index 42d5542334f8..000000000000
--- a/metadata/md5-cache/media-gfx/qosmic-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-lang/lua-5.1.4 dev-qt/qtgui:4 >=media-gfx/flam3-3.0.1 virtual/pkgconfig
-DESCRIPTION=A cosmic recursive flame fractal editor
-EAPI=4
-HOMEPAGE=https://github.com/bitsed/qosmic
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1.4 dev-qt/qtgui:4 >=media-gfx/flam3-3.0.1
-SLOT=0
-SRC_URI=https://qosmic.googlecode.com/files/qosmic-1.5.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7853028f0bade222d6d5d53482fb979
diff --git a/metadata/md5-cache/media-gfx/sam2p-0.49.3 b/metadata/md5-cache/media-gfx/sam2p-0.49.3
index 3785c0023e10..8b781269f072 100644
--- a/metadata/md5-cache/media-gfx/sam2p-0.49.3
+++ b/metadata/md5-cache/media-gfx/sam2p-0.49.3
@@ -4,10 +4,10 @@ DESCRIPTION=Utility to convert raster images to EPS, PDF and many others
 EAPI=6
 HOMEPAGE=https://github.com/pts/sam2p
 IUSE=examples gif
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pts/sam2p/archive/v0.49.3.tar.gz -> sam2p-0.49.3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f7a668e5a3a3253ecd634f50c0b53801
+_md5_=7a87fc96696869c49c091cc1f20c4252
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d727286d82b8..5c0866470b58 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/exiftool-10.90 b/metadata/md5-cache/media-libs/exiftool-10.90
new file mode 100644
index 000000000000..fb20a7f0e224
--- /dev/null
+++ b/metadata/md5-cache/media-libs/exiftool-10.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.90.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=20d25e5adbde45b4c4c9e8f4871dd23a
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.12.6 b/metadata/md5-cache/media-libs/fontconfig-2.12.6
index 0ebcd2ea3d0e..7db0b9826a80 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.12.6
+++ b/metadata/md5-cache/media-libs/fontconfig-2.12.6
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=6
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.7.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.12.6.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3aee0bf4536004e60f14c49baeba49b2
+_md5_=32f8aa7c6810e6150d6995f4f8ac339c
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.6 b/metadata/md5-cache/media-libs/libvorbis-1.3.6
index faa8bd617fec..3f8dc937f503 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.6
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.6
@@ -4,10 +4,10 @@ DESCRIPTION=The Ogg Vorbis sound file format library
 EAPI=5
 HOMEPAGE=https://xiph.org/vorbis/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a156c79099b1ba07cfdd6c88f64f3670
+_md5_=7f06ff9847d8bc466d319e4051a85d8a
diff --git a/metadata/md5-cache/media-libs/mesa-17.3.8 b/metadata/md5-cache/media-libs/mesa-17.3.8
index b061dc3fc739..30c0ae30d7e8 100644
--- a/metadata/md5-cache/media-libs/mesa-17.3.8
+++ b/metadata/md5-cache/media-libs/mesa-17.3.8
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=6
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) classic? ( app-eselect/eselect-mesa ) gallium? ( app-eselect/eselect-mesa ) >=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/clang-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/llvm-3.9.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
 REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) vaapi? ( gallium ) vdpau? ( gallium ) vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) wayland? ( egl gbm ) xa? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_imx? ( gallium video_cards_vivante ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=https://mesa.freedesktop.org/archive/mesa-17.3.8.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	b963274a93e76570a88168c1f1db4cd7	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4dead1da1c4f48b9826fb9e0a4aaf6f0
+_md5_=09d390d541b46ed171fbad98f2f5a823
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 2f2de1d949fc..b8bd02146759 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
index c291d1b9829b..14e000f6fd4b 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.19
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
 SLOT=0
-SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz-9af21218a87572bd4ab8d8d660c11f6295144f97 -> kodi-inputstream-adaptive-2.0.19.tar.gz
+SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/9af21218a87572bd4ab8d8d660c11f6295144f97 -> kodi-inputstream-adaptive-2.0.19.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	kodi-addon	0e7c54e54339006ad4f8a6cc2d67191c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e51800f113309b2e267c0ab32bad8319
+_md5_=8ab9014f01f18bfdc1fbcb4e084fdccd
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20
new file mode 100644
index 000000000000..3ac1774c49f7
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/c51b9a9b58a645f820883e6d99982277fc58aac5 -> kodi-inputstream-adaptive-2.0.20.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	kodi-addon	0e7c54e54339006ad4f8a6cc2d67191c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=961cd8974c79b8c93d82671083c3e94e
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index a68196b9976b..127bb822e1b2 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r3 b/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r3
deleted file mode 100644
index e6b0ef1b9683..000000000000
--- a/metadata/md5-cache/media-video/qt-recordmydesktop-0.3.8-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=>=dev-python/PyQt4-4.1[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=media-video/recordmydesktop-0.3.8 x11-apps/xwininfo 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-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Qt4 interface for RecordMyDesktop
-EAPI=6
-HOMEPAGE=http://recordmydesktop.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/PyQt4-4.1[X,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=media-video/recordmydesktop-0.3.8 x11-apps/xwininfo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/recordmydesktop/qt-recordmydesktop-0.3.8.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c3e34b83511ce152886b4e6fd582be88
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 555f09c95233..6fdce909ff43 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/fail2ban-0.10.1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
index 6ffee91c59a1..f7cc485148d5 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_4? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_5? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_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_jython2_7(-),-python_single_target_pypy3(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( 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_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.1 -> fail2ban-0.10.1.tar.gz
+SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.3.1 -> fail2ban-0.10.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1a86269f822edc85f75c2654ad73e52
+_md5_=787a375c17d27fd8288a44a80cff1b6e
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index c22fffb24530..e968e08657e4 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/epic5-1.1.10-r2 b/metadata/md5-cache/net-irc/epic5-1.1.10-r2
new file mode 100644
index 000000000000..b920127175b8
--- /dev/null
+++ b/metadata/md5-cache/net-irc/epic5-1.1.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2:0 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) valgrind? ( dev-util/valgrind ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Epic5 IRC Client
+EAPI=6
+HOMEPAGE=http://epicsol.org/
+IUSE=archive ipv6 perl tcl ruby socks5 valgrind
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/openssl-0.9.8e-r3:0 >=sys-libs/ncurses-5.6-r2:0 virtual/libiconv archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl:0 ) socks5? ( net-proxy/dante ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems )
+SLOT=0
+SRC_URI=ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.10.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cc115a1422f8857054434b1a166fb88b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 32907cdf23eb..a864b935984c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1 b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
index 1b3002cece1b..f3a8521e2875 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f113baca73408d2cc34d45c65f4da70
+_md5_=029c0f9cfbc77491bd1856061c12dbe6
diff --git a/metadata/md5-cache/net-libs/nodejs-8.11.1 b/metadata/md5-cache/net-libs/nodejs-8.11.1
index 1bec8ad503a9..01d9a99c78c4 100644
--- a/metadata/md5-cache/net-libs/nodejs-8.11.1
+++ b/metadata/md5-cache/net-libs/nodejs-8.11.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.19.1:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v8.11.1/node-v8.11.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f60c155656e318afd31d48a5c2cead4b
+_md5_=de43ae06158e0a413178e5cb0aaa6819
diff --git a/metadata/md5-cache/net-libs/nodejs-9.10.1 b/metadata/md5-cache/net-libs/nodejs-9.10.1
index 210fff5b7823..ab9be5173b02 100644
--- a/metadata/md5-cache/net-libs/nodejs-9.10.1
+++ b/metadata/md5-cache/net-libs/nodejs-9.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v9.10.1/node-v9.10.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a223f7cb25860cf29f2eab97dd1d0c0
+_md5_=a6a5f686cf53fced3fade10099b3f526
diff --git a/metadata/md5-cache/net-libs/nodejs-9.11.1 b/metadata/md5-cache/net-libs/nodejs-9.11.1
new file mode 100644
index 000000000000..564b3ebc9e19
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-9.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v9.11.1/node-v9.11.1.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=869801922a180cbd5aef586c89784b1f
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index 65774426e092..5d078610b92d 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test python_targets_python2_7
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.16.1:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.25.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
+RDEPEND=>=dev-libs/libuv-1.19.2:= >=net-libs/http-parser-2.8.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-61.1:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
 REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4a479d796be02c34420e0030eedc529
+_md5_=f965f9a0f2fec0a6980db087efb28236
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 62fe17f62b1f..13f9597b307f 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/aria2-1.33.1 b/metadata/md5-cache/net-misc/aria2-1.33.1
index 9105662522f6..6276fb05a8e4 100644
--- a/metadata/md5-cache/net-misc/aria2-1.33.1
+++ b/metadata/md5-cache/net-misc/aria2-1.33.1
@@ -4,7 +4,7 @@ DESCRIPTION=A download utility with segmented downloading with BitTorrent suppor
 EAPI=6
 HOMEPAGE=https://aria2.github.io/
 IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib:0= ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= ) !gnutls? ( dev-libs/openssl:0= ) ) adns? ( >=net-dns/c-ares-1.5.0:0= ) bittorrent? ( ssl? ( gnutls? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) ) jemalloc? ( dev-libs/jemalloc ) libuv? ( dev-libs/libuv:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
 REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3f64ddf7c5c22b3a86045b50c826100e
+_md5_=1dc5b4304df3ca6619049234b0456363
diff --git a/metadata/md5-cache/net-misc/bird-1.6.3-r1 b/metadata/md5-cache/net-misc/bird-1.6.3-r1
index 796ff68c4b4f..85eb02716ebd 100644
--- a/metadata/md5-cache/net-misc/bird-1.6.3-r1
+++ b/metadata/md5-cache/net-misc/bird-1.6.3-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 or IPv6
 EAPI=6
 HOMEPAGE=http://bird.network.cz
 IUSE=+client debug ipv6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
 SLOT=0
 SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.3.tar.gz
-_md5_=bec5716f4c65d3b81b66e6503524d2de
+_md5_=cb55df744c1578331b0ed49722f2a440
diff --git a/metadata/md5-cache/net-misc/chrony-3.3_pre1 b/metadata/md5-cache/net-misc/chrony-3.3
index 1b2caad31da0..98cdb8435b41 100644
--- a/metadata/md5-cache/net-misc/chrony-3.3_pre1
+++ b/metadata/md5-cache/net-misc/chrony-3.3
@@ -10,6 +10,6 @@ RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sy
 REQUIRED_USE=?? ( libedit readline )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://download.tuxfamily.org/chrony/chrony-3.3-pre1.tar.gz
+SRC_URI=https://download.tuxfamily.org/chrony/chrony-3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3df716d109138cbeaca71c42c3709822
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.1 b/metadata/md5-cache/net-misc/dhcpcd-7.0.1
index 889c07afec63..be1271bf85ac 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-7.0.1
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=6
 HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
 IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev )
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b994e02ce3d8f6ec133d5af8ae639298
+_md5_=3ce995a320a63d577cbe18b770415f7a
diff --git a/metadata/md5-cache/net-misc/dhcpcd-7.0.3 b/metadata/md5-cache/net-misc/dhcpcd-7.0.3
new file mode 100644
index 000000000000..c995f6283903
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-7.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev ) virtual/pkgconfig
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=6
+HOMEPAGE=http://roy.marples.name/projects/dhcpcd/
+IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev )
+SLOT=0
+SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-7.0.3.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fe5806965ee6941d23dae3ba65a6747a
diff --git a/metadata/md5-cache/net-misc/gerbera-9999 b/metadata/md5-cache/net-misc/gerbera-9999
index ff9318c4728c..3de05c35f4cb 100644
--- a/metadata/md5-cache/net-misc/gerbera-9999
+++ b/metadata/md5-cache/net-misc/gerbera-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=UPnP Media Server (Based on MediaTomb)
 EAPI=6
 HOMEPAGE=https://github.com/gerbera/gerbera
-IUSE=curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib
+IUSE=curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib
 LICENSE=GPL-2
-RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
+RDEPEND=!!net-misc/mediatomb net-libs/libupnp:1.8[ipv6,reuseaddr] >=dev-db/sqlite-3 dev-libs/expat mysql? ( virtual/mysql ) javascript? ( dev-lang/duktape ) taglib? ( >=media-libs/taglib-1.11 ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) exiv2? ( media-gfx/exiv2 ) ffmpeg? ( libav? ( >=media-video/libav-10:0= ) !libav? ( >=media-video/ffmpeg-2.2:0= ) ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) curl? ( net-misc/curl net-misc/youtube-dl ) magic? ( sys-apps/file ) sys-apps/util-linux sys-libs/zlib virtual/libiconv virtual/tmpfiles
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e2faa3d26ee615e6a1fe752f8a76057
+_md5_=2685d6df94eeb9ea404bf2fa8d3d1425
diff --git a/metadata/md5-cache/net-misc/iperf-3.5 b/metadata/md5-cache/net-misc/iperf-3.5
index a6181ceaf525..067d5457a39d 100644
--- a/metadata/md5-cache/net-misc/iperf-3.5
+++ b/metadata/md5-cache/net-misc/iperf-3.5
@@ -4,10 +4,10 @@ DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
 EAPI=6
 HOMEPAGE=https://github.com/esnet/iperf/
 IUSE=sctp static-libs
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint
 LICENSE=BSD
 RDEPEND=sctp? ( net-misc/lksctp-tools )
 SLOT=3
 SRC_URI=https://github.com/esnet/iperf/archive/3.5.tar.gz -> iperf-3.5.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1f418b919efb1f6e01c51d71d7f7d94
+_md5_=9fe4db9b9ea91bc243947d6296d6b07e
diff --git a/metadata/md5-cache/net-misc/ndisc6-1.0.3 b/metadata/md5-cache/net-misc/ndisc6-1.0.3
index d4ffef895f57..e814b4aefe77 100644
--- a/metadata/md5-cache/net-misc/ndisc6-1.0.3
+++ b/metadata/md5-cache/net-misc/ndisc6-1.0.3
@@ -4,8 +4,8 @@ DESCRIPTION=Recursive DNS Servers discovery Daemon (rdnssd) for IPv6
 EAPI=5
 HOMEPAGE=http://www.remlab.net/ndisc6/
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.remlab.net/files/ndisc6/ndisc6-1.0.3.tar.bz2
-_md5_=798ce9df3129594a5176208c048851c3
+_md5_=4feae1ada6b69c11038632601a999cf9
diff --git a/metadata/md5-cache/net-misc/openvswitch-2.8.1 b/metadata/md5-cache/net-misc/openvswitch-2.8.1
index ae15b7e0c906..fcd2e675ed4a 100644
--- a/metadata/md5-cache/net-misc/openvswitch-2.8.1
+++ b/metadata/md5-cache/net-misc/openvswitch-2.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Production quality, multilayer virtual switch
 EAPI=6
 HOMEPAGE=https://www.openvswitch.org
 IUSE=debug modules monitor +ssl kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ~dev-python/ovs-2.7.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] || ( dev-python/twisted[conch,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] debug? ( dev-lang/perl ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://www.openvswitch.org/releases/openvswitch-2.8.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cc6715a70fa8ca5780c38a815e22486e
+_md5_=ec38fd537faf9bfb74241328a8dd5031
diff --git a/metadata/md5-cache/net-misc/rclone-1.40 b/metadata/md5-cache/net-misc/rclone-1.40
new file mode 100644
index 000000000000..6f93f2b23333
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rclone-1.40
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A program to sync files to and from various cloud storage providers
+EAPI=6
+HOMEPAGE=https://rclone.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://github.com/ncw/rclone/archive/v1.40.tar.gz -> rclone-1.40.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2c53abcdf6fe8ec4c359c7434aea02b2
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index ccf6a676d2a8..05655af8debd 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
index 99552d4a9194..8953e1fa2a46 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6291f0a203191163586bda83a86e0cee
+_md5_=2ad4c8aad717149052aa0961f48919db
diff --git a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1 b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1
index 16da6fc55249..c333fed003f1 100644
--- a/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1
+++ b/metadata/md5-cache/net-p2p/bitcoin-qt-0.16.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An end-user Qt GUI for the Bitcoin crypto-currency
 EAPI=6
 HOMEPAGE=https://bitcoincore.org/ https://bitcoinknots.org/
 IUSE=+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq
-KEYWORDS=~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] dev-libs/univalue:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 virtual/bitcoin-leveldb bip70? ( dev-libs/protobuf:= ) dbus? ( dev-qt/qtdbus:5 ) libevent? ( dev-libs/libevent:= ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) qrcode? ( media-gfx/qrencode:= ) upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) wallet? ( sys-libs/db:4.8=[cxx] ) zeromq? ( net-libs/zeromq:= )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/4b4d7eb255ca8f9a94b92479e6061d129c91a991.tar.gz -> bitcoin-v0.16.0.tar.gz https://bitcoinknots.org/files/0.16.x/0.16.0.knots20180322/bitcoin-0.16.0.knots20180322.patches.txz -> bitcoin-0.16.0.knots20180322.patches.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	db-use	582140d1a711279e50ce284fc7b609f5	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2beaab2acc030cda261b61bcc081d792
+_md5_=b1e19175c67f42507220ba27b25fd1e3
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6.1
new file mode 100644
index 000000000000..4e72e680483f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=6
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson curl? ( >=net-misc/curl-7.15[ssl] ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.8.6.1.tar.gz -> cpuminer-opt-3.8.6.1.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ffb002741956a23c2873e063e6d2616b
diff --git a/metadata/md5-cache/net-p2p/xmr-stak-2.4.2-r1 b/metadata/md5-cache/net-p2p/xmr-stak-2.4.2-r1
new file mode 100644
index 000000000000..c546dc897929
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/xmr-stak-2.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Unified all-in-one Monero miner
+EAPI=6
+HOMEPAGE=https://github.com/fireice-uk/xmr-stak
+IUSE=cuda devfee hwloc opencl ssl webserver
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=cuda? ( dev-util/nvidia-cuda-toolkit ) hwloc? ( sys-apps/hwloc ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:0= ) webserver? ( net-libs/libmicrohttpd )
+SLOT=0
+SRC_URI=https://github.com/fireice-uk/xmr-stak/archive/2.4.2.tar.gz -> xmr-stak-2.4.2.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f4220a769cd460f7b9055197a2f1c4c
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 44708f8cea46..63020f329cd0 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/chirp-20180331 b/metadata/md5-cache/net-wireless/chirp-20180331
new file mode 100644
index 000000000000..bd469c3bc1e2
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/chirp-20180331
@@ -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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Free open-source tool for programming your amateur radio
+EAPI=6
+HOMEPAGE=http://chirp.danplanet.com
+IUSE=radioreference python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] radioreference? ( dev-python/suds[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://trac.chirp.danplanet.com/chirp_daily/daily-20180331/chirp-daily-20180331.tar.gz
+_eclasses_=distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5ffd395f67a12ab2cc650f924108cbcb
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 53239deb37c5..df513fea1c11 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/common_tutorials-0.1.11 b/metadata/md5-cache/ros-meta/common_tutorials-0.1.11
new file mode 100644
index 000000000000..bf8aea8a8779
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/common_tutorials-0.1.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage that contains common tutorials
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/common_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib_tutorials dev-ros/nodelet_tutorial_math dev-ros/pluginlib_tutorials dev-ros/turtle_actionlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.11.tar.gz -> common_tutorials-0.1.11.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4bb9c69c27ef96cf395e1b3974681e34
diff --git a/metadata/md5-cache/ros-meta/desktop-1.2.0 b/metadata/md5-cache/ros-meta/desktop-1.3.2
index 026e19a1e4bd..702e69bace84 100644
--- a/metadata/md5-cache/ros-meta/desktop-1.2.0
+++ b/metadata/md5-cache/ros-meta/desktop-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/urdf_tutorial ros-meta/visualization_tutorials sys-devel/make >=dev-util/cmake-3.9.6 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=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for a basic ROS desktop install
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/desktop
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9ca3982b724c0e49821836a5b0c9641
+_md5_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop-9999 b/metadata/md5-cache/ros-meta/desktop-9999
index 2e8e7ec55c79..c5908909757f 100644
--- a/metadata/md5-cache/ros-meta/desktop-9999
+++ b/metadata/md5-cache/ros-meta/desktop-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint ros-meta/visualization_tutorials >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for a basic ROS desktop install
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/desktop
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/viz dev-ros/roslint ros-meta/visualization_tutorials 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=ros-meta/robot ros-meta/viz dev-ros/angles ros-meta/common_tutorials ros-meta/geometry_tutorials ros-meta/ros_tutorials dev-ros/roslint dev-ros/urdf_tutorial ros-meta/visualization_tutorials 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_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=002a9364be434f3919886a0c3f506012
+_md5_=aa61b13f15c0356c0047639e2cced2f5
diff --git a/metadata/md5-cache/ros-meta/desktop_full-1.2.0 b/metadata/md5-cache/ros-meta/desktop_full-1.3.2
index b5073b6d57f1..444eee3806d0 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-1.2.0
+++ b/metadata/md5-cache/ros-meta/desktop_full-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators sys-devel/make >=dev-util/cmake-3.9.6 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=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for ROS complete desktop install
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/desktop_full
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators 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=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tutorial python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4af2fc71fa081bb2b03744c57a277181
+_md5_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/desktop_full-9999 b/metadata/md5-cache/ros-meta/desktop_full-9999
index 9557dad3b052..066e9f6424d9 100644
--- a/metadata/md5-cache/ros-meta/desktop_full-9999
+++ b/metadata/md5-cache/ros-meta/desktop_full-9999
@@ -9,4 +9,4 @@ RDEPEND=ros-meta/desktop ros-meta/perception ros-meta/simulators dev-ros/urdf_tu
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e640a7782f7553349cdf59f4d9022123
+_md5_=925382c42c81e47395b6a441507f1b35
diff --git a/metadata/md5-cache/ros-meta/perception-1.3.0 b/metadata/md5-cache/ros-meta/perception-1.3.0
deleted file mode 100644
index 13f2b73de50c..000000000000
--- a/metadata/md5-cache/ros-meta/perception-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for ROS perception stack
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/perception
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e73585007f17dab9fbb90e552ad4c6f0
diff --git a/metadata/md5-cache/ros-meta/perception-1.2.0 b/metadata/md5-cache/ros-meta/perception-1.3.2
index f18295de0aea..21ae2ce715cc 100644
--- a/metadata/md5-cache/ros-meta/perception-1.2.0
+++ b/metadata/md5-cache/ros-meta/perception-1.3.2
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=ros-meta/ros_base ros-meta/image_common ros-meta/image_pipeline ros-meta/image_transport_plugins ros-meta/laser_pipeline ros-meta/perception_pcl ros-meta/vision_opencv python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e73585007f17dab9fbb90e552ad4c6f0
+_md5_=ff6f17e09ce3d2c7ef39304407cdfb0e
diff --git a/metadata/md5-cache/ros-meta/robot-1.2.0 b/metadata/md5-cache/ros-meta/perception_pcl-1.5.4
index 43abaad207b2..4992c2032bb8 100644
--- a/metadata/md5-cache/ros-meta/robot-1.2.0
+++ b/metadata/md5-cache/ros-meta/perception_pcl-1.5.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
+DEPEND=dev-ros/pcl_ros sys-devel/make >=dev-util/cmake-3.9.6 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=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
-HOMEPAGE=http://wiki.ros.org/robot
+HOMEPAGE=http://wiki.ros.org/perception_pcl
 IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib 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/pcl_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.5.4.tar.gz -> perception_pcl-1.5.4.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75629b4ba195fa35524e18da174858dc
+_md5_=df339878c07a65707657b06de2c0ca26
diff --git a/metadata/md5-cache/ros-meta/robot-1.3.0 b/metadata/md5-cache/ros-meta/robot-1.3.2
index 45c7a0dc6d7c..e8cc357e7a1d 100644
--- a/metadata/md5-cache/ros-meta/robot-1.3.0
+++ b/metadata/md5-cache/ros-meta/robot-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.9.6 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=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib 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=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75629b4ba195fa35524e18da174858dc
+_md5_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/robot-9999 b/metadata/md5-cache/ros-meta/robot-9999
index 095d6b40f2bf..4b03038e0a6c 100644
--- a/metadata/md5-cache/ros-meta/robot-9999
+++ b/metadata/md5-cache/ros-meta/robot-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_base and includes ROS libaries for any robot hardware
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics dev-ros/filters ros-meta/geometry ros-meta/robot_model dev-ros/robot_state_publisher dev-ros/xacro ros-meta/executive_smach dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib 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=ros-meta/ros_base dev-ros/control_msgs ros-meta/diagnostics ros-meta/executive_smach dev-ros/filters ros-meta/geometry dev-ros/joint_state_publisher dev-ros/kdl_parser dev-ros/kdl_parser_py dev-ros/robot_state_publisher dev-ros/urdf dev-ros/urdf_parser_plugin dev-ros/xacro 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_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=75629b4ba195fa35524e18da174858dc
+_md5_=5991742670bacdaa83c4f382ef2ce2a4
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.3.0 b/metadata/md5-cache/ros-meta/ros_base-1.3.0
deleted file mode 100644
index 23a90686ec71..000000000000
--- a/metadata/md5-cache/ros-meta/ros_base-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_core and includes other basic non-robot tools
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/ros_base
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44115d0dc4e7e11905e82489319f2df0
diff --git a/metadata/md5-cache/ros-meta/ros_base-1.2.0 b/metadata/md5-cache/ros-meta/ros_base-1.3.2
index 7e79e63f94da..4d4a6b6ba33a 100644
--- a/metadata/md5-cache/ros-meta/ros_base-1.2.0
+++ b/metadata/md5-cache/ros-meta/ros_base-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.9.6 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/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/nodelet_core dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_core and includes other basic non-robot tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ros_base
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib 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/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/nodelet_core dev-ros/pluginlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44115d0dc4e7e11905e82489319f2df0
+_md5_=d5e3809edf44f615f6bf3f88ebb62ff8
diff --git a/metadata/md5-cache/ros-meta/ros_base-9999 b/metadata/md5-cache/ros-meta/ros_base-9999
index 95eec01bfe46..b5a6da176ff8 100644
--- a/metadata/md5-cache/ros-meta/ros_base-9999
+++ b/metadata/md5-cache/ros-meta/ros_base-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/nodelet_core dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage which extends ros_core and includes other basic non-robot tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ros_base
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/common_tutorials ros-meta/nodelet_core dev-ros/pluginlib 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/actionlib ros-meta/bond_core dev-ros/class_loader dev-ros/dynamic_reconfigure ros-meta/nodelet_core dev-ros/pluginlib 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_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44115d0dc4e7e11905e82489319f2df0
+_md5_=d5e3809edf44f615f6bf3f88ebb62ff8
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.2.0 b/metadata/md5-cache/ros-meta/ros_core-1.2.0
deleted file mode 100644
index 7dcb61d9e762..000000000000
--- a/metadata/md5-cache/ros-meta/ros_core-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage to aggregate the packages required to use core ROS concepts
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/ros_core
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f0a9e768d6aa5350f8cc3b2f68e4883
diff --git a/metadata/md5-cache/ros-meta/ros_core-1.3.0 b/metadata/md5-cache/ros-meta/ros_core-1.3.2
index 131aae246bd2..ed197c8dc870 100644
--- a/metadata/md5-cache/ros-meta/ros_core-1.3.0
+++ b/metadata/md5-cache/ros-meta/ros_core-1.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/gennodejs dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp sys-devel/make >=dev-util/cmake-3.9.6 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-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage to aggregate the packages required to use core ROS concepts
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ros_core
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/gennodejs dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp 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-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1abd0327346587ff594dd05ad5a8d20f
+_md5_=3e89c6256f646e62b53a60c5802dcbfe
diff --git a/metadata/md5-cache/ros-meta/ros_core-9999 b/metadata/md5-cache/ros-meta/ros_core-9999
index dab7b8b37b60..afcc621dbe71 100644
--- a/metadata/md5-cache/ros-meta/ros_core-9999
+++ b/metadata/md5-cache/ros-meta/ros_core-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/gennodejs dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage to aggregate the packages required to use core ROS concepts
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ros_core
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genpy dev-ros/gennodejs dev-ros/genmsg dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs ros-meta/ros_tutorials dev-ros/roslisp 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-util/catkin dev-ros/cmake_modules ros-meta/common_msgs dev-ros/gencpp dev-ros/geneus dev-ros/genlisp dev-ros/genmsg dev-ros/gennodejs dev-ros/genpy dev-ros/message_generation dev-ros/message_runtime ros-meta/ros ros-meta/ros_comm dev-ros/rosbag_migration_rule dev-ros/rosconsole_bridge ros-meta/roscpp_core dev-ros/rosgraph_msgs dev-ros/roslisp dev-ros/rospack dev-ros/std_msgs dev-ros/std_srvs 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_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1abd0327346587ff594dd05ad5a8d20f
+_md5_=3e89c6256f646e62b53a60c5802dcbfe
diff --git a/metadata/md5-cache/ros-meta/simulators-1.3.0 b/metadata/md5-cache/ros-meta/simulators-1.3.0
deleted file mode 100644
index 8acc71d9e234..000000000000
--- a/metadata/md5-cache/ros-meta/simulators-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for ROS simulation packages
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/simulators
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a3f2f7b614467fb13f0bfb6eb557806
diff --git a/metadata/md5-cache/ros-meta/simulators-1.2.0 b/metadata/md5-cache/ros-meta/simulators-1.3.2
index d8a4854e7f20..528f8042507d 100644
--- a/metadata/md5-cache/ros-meta/simulators-1.2.0
+++ b/metadata/md5-cache/ros-meta/simulators-1.3.2
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=ros-meta/robot ros-meta/gazebo_ros_pkgs ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/stage_ros python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a3f2f7b614467fb13f0bfb6eb557806
+_md5_=fb9965e70cfbaf4ec2df224175f672ad
diff --git a/metadata/md5-cache/ros-meta/viz-1.3.0 b/metadata/md5-cache/ros-meta/viz-1.3.0
deleted file mode 100644
index cc9991527d66..000000000000
--- a/metadata/md5-cache/ros-meta/viz-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz sys-devel/make >=dev-util/cmake-3.9.6 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=Metapackage for ROS visualization packages
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/viz
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.3.0.tar.gz -> metapackages-1.3.0.tar.gz
-_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=180f2e8ba0e4f3aa0fef11109f4776cd
diff --git a/metadata/md5-cache/ros-meta/viz-1.2.0 b/metadata/md5-cache/ros-meta/viz-1.3.2
index a5b0ec6d7f72..bd867c75e3cc 100644
--- a/metadata/md5-cache/ros-meta/viz-1.2.0
+++ b/metadata/md5-cache/ros-meta/viz-1.3.2
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=ros-meta/ros_base ros-meta/rqt_common_plugins ros-meta/rqt_robot_plugins dev-ros/rviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/ros/metapackages/archive/1.2.0.tar.gz -> metapackages-1.2.0.tar.gz
+SRC_URI=https://github.com/ros/metapackages/archive/1.3.2.tar.gz -> metapackages-1.3.2.tar.gz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=180f2e8ba0e4f3aa0fef11109f4776cd
+_md5_=904ae5a0d15a49683ee7f1f2398e3cbc
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index acc8d5c969ad..56890057fd0c 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/qrna-2.0.3c-r2 b/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
index 37bb03c339fe..afc13c4ac903 100644
--- a/metadata/md5-cache/sci-biology/qrna-2.0.3c-r2
+++ b/metadata/md5-cache/sci-biology/qrna-2.0.3c-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl sci-biology/hmmer
+DEPEND=dev-lang/perl sci-biology/hmmer:2
 DESCRIPTION=Prototype ncRNA genefinder
 EAPI=6
 HOMEPAGE=http://selab.janelia.org/software.html
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl sci-biology/hmmer
+RDEPEND=dev-lang/perl sci-biology/hmmer:2
 SLOT=0
 SRC_URI=mirror://gentoo/qrna-2.0.3c.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=35f5a46d4490059eb478c8a8c7998ac5
+_md5_=0fc8dac0f54d22c60da996470b3b33ee
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index b39f609cbf78..0a716284933e 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/gwave-20090213-r1 b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
index 8dd62fee08e1..43c47031bbdf 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20090213-r1
+++ b/metadata/md5-cache/sci-electronics/gwave-20090213-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Analog waveform viewer for SPICE-like simulations
 EAPI=5
 HOMEPAGE=http://gwave.sourceforge.net
 IUSE=gnuplot plotutils
-KEYWORDS=amd64 ppc x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND==dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=mirror://sourceforge/gwave/gwave2-20090213.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8565c3dc86a58002029b6a09954bd2d
+_md5_=02c98b16772f058dd74ea87f36b3484a
diff --git a/metadata/md5-cache/sci-electronics/gwave-20120229 b/metadata/md5-cache/sci-electronics/gwave-20120229
index 18bd8056d97c..d50fe7a5f20b 100644
--- a/metadata/md5-cache/sci-electronics/gwave-20120229
+++ b/metadata/md5-cache/sci-electronics/gwave-20120229
@@ -4,10 +4,10 @@ DESCRIPTION=Analog waveform viewer for SPICE-like simulations
 EAPI=6
 HOMEPAGE=http://gwave.sourceforge.net
 IUSE=gnuplot plotutils
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2[deprecated,networking] <dev-scheme/guile-2.2 dev-scheme/guile-gnome-platform x11-libs/guile-gtk sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 SLOT=0
 SRC_URI=https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-249-trunk.zip
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0868488b247b2b9b51761d4b0694266
+_md5_=579120fa08ce90e4b0d5ef7eb4015834
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 44b67f5e4385..4464bd57d146 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.1 b/metadata/md5-cache/sci-geosciences/qgis-3.0.1
index 4a10a32241ec..afad989db2d8 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-3.0.1
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
 IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5[ssl] >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
 REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://qgis.org/downloads/qgis-3.0.1.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=77ac1f78d4c30c3fd8d433c6301325b2
+_md5_=41445b5c8ddc9eabe3be3d0cc6c28a7e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index efc95d727913..7ac1680779a2 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/gimps-29.4.8 b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
index 28f859c1d55a..07a20c49d01e 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-29.4.8
+++ b/metadata/md5-cache/sci-mathematics/gimps-29.4.8
@@ -3,10 +3,10 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=6
 HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2
 SLOT=0
 SRC_URI=amd64? ( ftp://mersenne.org/gimps/p95v294b8.linux64.tar.gz )
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=648ba5a93809c7cb0af34c5f542427de
+_md5_=fabc35efa1b3a651b1e93fef37bed314
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 532d4fc4c413..ca1836fa1f8d 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/bleachbit-1.12 b/metadata/md5-cache/sys-apps/bleachbit-1.12
deleted file mode 100644
index c26b19187605..000000000000
--- a/metadata/md5-cache/sys-apps/bleachbit-1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Clean junk to free disk space and to maintain privacy
-EAPI=6
-HOMEPAGE=https://www.bleachbit.org
-IUSE=+gtk nls python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/bleachbit/bleachbit-1.12.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c417670671ba22900813ad8a235922e9
diff --git a/metadata/md5-cache/sys-apps/bleachbit-2.0 b/metadata/md5-cache/sys-apps/bleachbit-2.0
index 31aabd40b900..e6ec149252e4 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-2.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Clean junk to free disk space and to maintain privacy
 EAPI=6
 HOMEPAGE=https://www.bleachbit.org
 IUSE=+gtk python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=gtk? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/bleachbit/bleachbit/archive/v2.0.tar.gz -> bleachbit-2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aa4bf5742f4bc067662eafd8ef413e82
+_md5_=f78d82cf4160df8f1d4d474f52b8e5ad
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1 b/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
new file mode 100644
index 000000000000..18cdd6f7d3bd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=A collection of tools to let /etc be stored in a repository
+EAPI=6
+HOMEPAGE=https://etckeeper.branchable.com/
+IUSE=bazaar cron python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( 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(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
+REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
+SLOT=0
+SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.6.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=78e2df8260daf8a2ef0a38e1b71a76dc
diff --git a/metadata/md5-cache/sys-apps/etckeeper-1.18.7 b/metadata/md5-cache/sys-apps/etckeeper-1.18.7
new file mode 100644
index 000000000000..1a207e29f024
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/etckeeper-1.18.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-util/bats )
+DESCRIPTION=A collection of tools to let /etc be stored in a repository
+EAPI=6
+HOMEPAGE=https://etckeeper.branchable.com/
+IUSE=bazaar cron test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-portage/portage-utils cron? ( virtual/cron ) bazaar? ( 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(-)] ) !bazaar? ( || ( dev-vcs/git dev-vcs/mercurial dev-vcs/darcs ) )
+REQUIRED_USE=bazaar? ( || ( python_targets_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-1.18.7.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f286bfd833e40a7ea45f1adc07476d55
diff --git a/metadata/md5-cache/sys-apps/fbset-2.1 b/metadata/md5-cache/sys-apps/fbset-2.1
index 9380806529ac..e0661bbf2006 100644
--- a/metadata/md5-cache/sys-apps/fbset-2.1
+++ b/metadata/md5-cache/sys-apps/fbset-2.1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install prepare
 DEPEND=sys-devel/bison sys-devel/flex
 DESCRIPTION=A utility to set the framebuffer videomode
-EAPI=0
+EAPI=6
 HOMEPAGE=http://users.telenet.be/geertu/Linux/fbdev/
 IUSE=static
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://users.telenet.be/geertu/Linux/fbdev/fbset-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e29e09f8cbc2eddb0dae62f94f75d3a
+_md5_=a4645a79b5bf162a439ad0877b29f9bd
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
index e476ee459bc8..acf34e98c0af 100644
--- a/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
+++ b/metadata/md5-cache/sys-apps/haveged-1.9.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
 EAPI=6
 HOMEPAGE=http://www.issihosts.com/haveged/
 IUSE=selinux static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=GPL-3+
 RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4707e42ae74336b20ed5b7f1cc606337
+_md5_=6153dda947385c1177b5ffbe3d8eb6f4
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.56 b/metadata/md5-cache/sys-apps/inxi-2.3.56
new file mode 100644
index 000000000000..83c335738135
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/inxi-2.3.56
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=The CLI inxi collects and prints hardware and system information
+EAPI=6
+HOMEPAGE=https://github.com/smxi/inxi
+IUSE=bluetooth hddtemp opengl
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-apps/pciutils sys-apps/usbutils bluetooth? ( net-wireless/bluez ) hddtemp? ( app-admin/hddtemp ) opengl? ( x11-apps/mesa-progs )
+SLOT=0
+SRC_URI=https://github.com/smxi/inxi/tarball/803a4595658f28decd236c6f8660841abc336cea -> inxi-2.3.56.tar.gz
+_md5_=7356e1c997ae214deb5c232326440ce6
diff --git a/metadata/md5-cache/sys-apps/man-db-2.8.1 b/metadata/md5-cache/sys-apps/man-db-2.8.3
index f9bf9612da4f..4a51a68c1e93 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.8.1
+++ b/metadata/md5-cache/sys-apps/man-db-2.8.3
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 PDEPEND=manpager? ( app-text/manpager )
 RDEPEND=!sys-apps/man >=dev-libs/libpipeline-1.5.0 sys-apps/groff berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-mandb )
 SLOT=0
-SRC_URI=mirror://nongnu/man-db/man-db-2.8.1.tar.xz
+SRC_URI=mirror://nongnu/man-db/man-db-2.8.3.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f9ad878c0a00a32248e2911ac0d44e5f
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.24-r1 b/metadata/md5-cache/sys-apps/portage-2.3.24-r1
index 12627fe8b7a2..b7c84ec4c8fe 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.24-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.24-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
 IUSE=build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
 RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) rsync-verify? ( >=app-portage/gemato-10 app-crypt/gentoo-keys >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy pytho
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.24.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.24.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fe2e1099f3bdb79722bba8ab2de95897
+_md5_=8aaf3c57786ea5e3648af3332569fd62
diff --git a/metadata/md5-cache/sys-apps/pv-1.6.6 b/metadata/md5-cache/sys-apps/pv-1.6.6
index 26bc42d910d7..204edf400b2a 100644
--- a/metadata/md5-cache/sys-apps/pv-1.6.6
+++ b/metadata/md5-cache/sys-apps/pv-1.6.6
@@ -3,9 +3,9 @@ DESCRIPTION=Pipe Viewer: a tool for monitoring the progress of data through a pi
 EAPI=6
 HOMEPAGE=http://www.ivarch.com/programs/pv.shtml
 IUSE=debug nls
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://www.ivarch.com/programs/sources/pv-1.6.6.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9d989008dfd2e5421050e99cc0fd624a
+_md5_=b3baf2c95be519bf72f575691201576f
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.13 b/metadata/md5-cache/sys-apps/sandbox-2.13
index 1c5cd287bd22..8ecc2a0bbd34 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.13
+++ b/metadata/md5-cache/sys-apps/sandbox-2.13
@@ -4,9 +4,9 @@ DESCRIPTION=sandbox'd LD_PRELOAD hack
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/sandbox/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.13.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f6411325cbb952a53d8796a6bfe2337
+_md5_=134660ba0a7579b89b62067a0eff1c52
diff --git a/metadata/md5-cache/sys-apps/setserial-2.17-r5 b/metadata/md5-cache/sys-apps/setserial-2.17-r5
index da30b85b38b3..993ca96633c8 100644
--- a/metadata/md5-cache/sys-apps/setserial-2.17-r5
+++ b/metadata/md5-cache/sys-apps/setserial-2.17-r5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Configure your serial ports with it
 EAPI=6
 HOMEPAGE=http://setserial.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://tsx-11.mit.edu/pub/linux/sources/sbin/setserial-2.17.tar.gz ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/setserial-2.17.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dbf3b64474163906e694d19a4af41fdf
+_md5_=b150eda612ca472ef9825054e8c68794
diff --git a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r4 b/metadata/md5-cache/sys-apps/sparc-utils-1.9-r4
deleted file mode 100644
index 081d974c141a..000000000000
--- a/metadata/md5-cache/sys-apps/sparc-utils-1.9-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=virtual/os-headers
-DESCRIPTION=Various sparc utilities from Debian GNU/Linux
-EAPI=0
-HOMEPAGE=http://packages.debian.org/sparc-utils
-KEYWORDS=-* sparc
-LICENSE=GPL-2
-RDEPEND=|| ( >=sys-apps/util-linux-2.13-r1 sys-apps/setarch )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9.orig.tar.gz mirror://debian/pool/main/s/sparc-utils/sparc-utils_1.9-3.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3226beb32fb56e1ec7bae41581b6ec88
diff --git a/metadata/md5-cache/sys-apps/systemd-238-r3 b/metadata/md5-cache/sys-apps/systemd-238-r4
index f257fa41d2b7..53439e6445b8 100644
--- a/metadata/md5-cache/sys-apps/systemd-238-r3
+++ b/metadata/md5-cache/sys-apps/systemd-238-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v238/systemd-238.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-238-patches-0.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=063fd69f85a8974171568f60bd22cc58
+_md5_=b5d1b79cc61777dbf7d11f74c6a7fa9b
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.2 b/metadata/md5-cache/sys-apps/timer_entropyd-0.2
deleted file mode 100644
index da839694e261..000000000000
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=A timer-based entropy generator
-EAPI=4
-HOMEPAGE=http://www.vanheusden.com/te/
-IUSE=debug selinux
-KEYWORDS=amd64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.2.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9783d8a28a5467971224ddb64643d28c
diff --git a/metadata/md5-cache/sys-apps/timer_entropyd-0.3 b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
index 7062387d463f..146af9c0e33d 100644
--- a/metadata/md5-cache/sys-apps/timer_entropyd-0.3
+++ b/metadata/md5-cache/sys-apps/timer_entropyd-0.3
@@ -3,10 +3,10 @@ DESCRIPTION=A timer-based entropy generator
 EAPI=5
 HOMEPAGE=http://www.vanheusden.com/te/
 IUSE=debug selinux
-KEYWORDS=amd64 ~mips ~x86
+KEYWORDS=amd64 ~mips x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-entropyd )
 SLOT=0
 SRC_URI=http://www.vanheusden.com/te/timer_entropyd-0.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f6f89927e4eff68467aeb59f4899e4f
+_md5_=e5f5a597ffc5992cc4784d7f1c82dc0e
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.32-r1 b/metadata/md5-cache/sys-apps/util-linux-2.32-r1
new file mode 100644
index 000000000000..13d3a157cc4f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/util-linux-2.32-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) virtual/os-headers >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Various useful Linux utilities
+EAPI=6
+HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/util-linux/v2.32/util-linux-2.32.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f39b1eb417afbecb40c2bc04d31d6af6
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index 6ade88f0c994..e37efeabf191 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -3,10 +3,10 @@ DEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys
 DESCRIPTION=Various useful Linux utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
-IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74afa9d94f1376b59a91087334cda1a0
+_md5_=96e454e04c7de3fc00deb57bf32bad29
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 23adb067ab6b..bc49080a5195 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/mbuffer-20171011 b/metadata/md5-cache/sys-block/mbuffer-20171011
index 61518a421989..31a7a3408b51 100644
--- a/metadata/md5-cache/sys-block/mbuffer-20171011
+++ b/metadata/md5-cache/sys-block/mbuffer-20171011
@@ -4,9 +4,9 @@ DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functi
 EAPI=6
 HOMEPAGE=http://www.maier-komor.de/mbuffer.html
 IUSE=debug ssl test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20171011.tgz
-_md5_=b3144eb8ed6865f1ed18eda1bd47477c
+_md5_=78f67d32233aa8d518f3f56d9d09c5e4
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index daf03eed1f02..9c8f069fde8e 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/binutils-2.30-r1 b/metadata/md5-cache/sys-devel/binutils-2.30-r1
new file mode 100644
index 000000000000..ce2b10031437
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-2.30-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc >=app-portage/elt-patches-20170422 sys-devel/gnuconfig
+DESCRIPTION=Tools necessary to build programs
+EAPI=6
+HOMEPAGE=https://sourceware.org/binutils/
+IUSE=+cxx doc multitarget +nls static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-3+
+RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
+SLOT=2.30
+SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.30-patches-1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ed03322904dfeb4a2e95b2bda0d9c7be
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index 29a960f77932..39dfc3a823f0 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-3+
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=git
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cf1af69550730e8d0dcecbed8d272f91
+_md5_=a31ba2796a35cdd977a3f360cd17a52c
diff --git a/metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328 b/metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
index 7322f16a44ba..2323b404c551 100644
--- a/metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
+++ b/metadata/md5-cache/sys-devel/boost-m4-0.4_p20160328
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install
 DESCRIPTION=Another set of autoconf macros for compiling against boost
 EAPI=6
 HOMEPAGE=https://github.com/tsuna/boost.m4
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/boost-m4-0.4_p20160328.tar.gz
-_md5_=187ead387360d98266fa2c578a94a66e
+_md5_=ee972e83852480339ce2a9a6e4db4c38
diff --git a/metadata/md5-cache/sys-freebsd/Manifest.gz b/metadata/md5-cache/sys-freebsd/Manifest.gz
index 4ad8a2469017..029b62a4e5d7 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-9.1 b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1
new file mode 100644
index 000000000000..72c020460024
--- /dev/null
+++ b/metadata/md5-cache/sys-freebsd/freebsd-mk-defs-9.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=virtual/pmake virtual/pmake
+DESCRIPTION=Makefile definitions used for building and installing libraries and system files
+EAPI=3
+HOMEPAGE=http://www.freebsd.org/
+IUSE=userland_GNU profile
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/freebsd-share-9.1.tar.bz2
+_eclasses_=bsdmk	f76f6fc364f04987bc60c4ea3cad594c	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	freebsd	11f01cb2f2075a8c7bd1add8a60013a1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=f10a00caa64eb4acc8593e28ea856c4d
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index abbc11b9d4ce..d0fb088e79fe 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/btrfs-progs-4.16_rc1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.16
index 60d68d1f3313..f392d1caaa93 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.16_rc1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.16
@@ -4,10 +4,11 @@ DESCRIPTION=Btrfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://btrfs.wiki.kernel.org
 IUSE=+convert reiserfs static static-libs +zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) zstd? ( app-arch/zstd:0= )
 RESTRICT=test
 SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.16-rc1.tar.xz
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.16.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=f740c60ee2ca102027cc4c63efad7c05
diff --git a/metadata/md5-cache/sys-fs/fuse-3.2.2 b/metadata/md5-cache/sys-fs/fuse-3.2.2
new file mode 100644
index 000000000000..f2bc2b351a3f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-3.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/pytest[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pytest[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/pytest[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=An interface for filesystems implemented in userspace
+EAPI=6
+HOMEPAGE=https://github.com/libfuse/libfuse
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=sys-fs/fuse-common
+SLOT=3
+SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=68ade9b2bd36d430ab98b3cdeb3eb253
diff --git a/metadata/md5-cache/sys-fs/fuse-common-3.2.2 b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
new file mode 100644
index 000000000000..de06a102d1ad
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fuse-common-3.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Common files for multiple slots of sys-fs/fuse
+EAPI=6
+HOMEPAGE=https://github.com/libfuse/libfuse
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!<sys-fs/fuse-2.9.7-r1:0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.2.2/fuse-3.2.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bf587c968b0b081195389e77441659d1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index a743d5ceb340..5a45425ba37f 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/linux-headers-4.16 b/metadata/md5-cache/sys-kernel/linux-headers-4.16
new file mode 100644
index 000000000000..7423d01ca95c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=app-arch/xz-utils dev-lang/perl
+DESCRIPTION=Linux system headers
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
+IUSE=headers-only
+LICENSE=GPL-2
+RDEPEND=!!media-sound/alsa-headers
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-headers-base-4.16.tar.xz mirror://gentoo/gentoo-headers-4.16-1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-4.16.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-4.16-1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	kernel-2	6e37f651408d80af441518a0264b59c7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=98fa4dc98ac0fae3d95a86c16ae26bd8
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 6d15609bbfda..67aaf645f960 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/glibc-2.27-r1 b/metadata/md5-cache/sys-libs/glibc-2.27-r1
index 8243db84e805..d3bb6b4b33bf 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.27-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.27-r1
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.27.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.27-patches-1.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3e05bc5c86874528d7315bc274518b87
+_md5_=58eb78bc8ac53b50d6810212e9b9f7eb
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index a0d326b557af..4c47644bed51 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=2.2
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-5.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	25b08efef07cea6bcd45b8c6dcce2782	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2362af904cf3a846baf898ab51e44ed7
+_md5_=1105befee0d2292793a07afb75fd0bb1
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3 b/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3
deleted file mode 100644
index 1eaaee99efec..000000000000
--- a/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/libgpg-error >=dev-libs/libgcrypt-1.2.0:0 dev-libs/openssl:0 >=net-libs/gnutls-2.0.1 virtual/libiconv virtual/libintl fox? ( x11-libs/fox:1.6 ) gtk? ( >=x11-libs/gtk+-2.17.5:2 ) qt4? ( dev-qt/qtgui:4 ) virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen )
-DESCRIPTION=A multi-platform helper library for other libraries
-EAPI=5
-HOMEPAGE=http://www.aquamaniac.de/aqbanking/
-IUSE=debug doc fox gtk qt4
-KEYWORDS=amd64 ~hppa ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgpg-error >=dev-libs/libgcrypt-1.2.0:0 dev-libs/openssl:0 >=net-libs/gnutls-2.0.1 virtual/libiconv virtual/libintl fox? ( x11-libs/fox:1.6 ) gtk? ( >=x11-libs/gtk+-2.17.5:2 ) qt4? ( dev-qt/qtgui:4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=gwenhywfar-4.15.3.tar.gz -> gwenhywfar-4.15.3.tar.gz
-_md5_=92db54438ba554175ee120a4384afd7c
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3-r1 b/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3-r1
deleted file mode 100644
index f7d738d6a6ca..000000000000
--- a/metadata/md5-cache/sys-libs/gwenhywfar-4.15.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=dev-libs/libgpg-error dev-libs/libgcrypt:0= dev-libs/openssl:0= net-libs/gnutls:= virtual/libiconv virtual/libintl fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 ) virtual/pkgconfig sys-devel/gettext doc? ( app-doc/doxygen )
-DESCRIPTION=A multi-platform helper library for other libraries
-EAPI=6
-HOMEPAGE=http://www.aquamaniac.de/aqbanking/
-IUSE=debug doc fox gtk qt4 qt5
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgpg-error dev-libs/libgcrypt:0= dev-libs/openssl:0= net-libs/gnutls:= virtual/libiconv virtual/libintl fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtgui:4 ) qt5? ( dev-qt/qtgui:5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=gwenhywfar-4.15.3.tar.gz -> gwenhywfar-4.15.3.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=05983f5fa6e29d7d8c26da5574d8d1f6
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1 b/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1
index 3a4ddc2593d3..bcb705d13779 100644
--- a/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-4.19.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A multi-platform helper library for other libraries
 EAPI=6
 HOMEPAGE=https://www.aquamaniac.de/aqbanking/
 IUSE=debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit
-KEYWORDS=~amd64 ~hppa ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:2 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) test? ( dev-qt/qttest:5 ) webkit? ( dev-qt/qtwebkit:5 )
 REQUIRED_USE=designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/sites/download/download.php?package=01&release=207&file=01&dummy=gwenhywfar-4.19.0.tar.gz -> gwenhywfar-4.19.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9282803dc52921d2a567433f4a1cb683
+_md5_=7ae1fec36b39238af8726a1402f9ecbe
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index f7faafd319fb..cf369a265245 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/htop-2.1.0-r1 b/metadata/md5-cache/sys-process/htop-2.1.0-r1
index 9de68a5c5770..418eefca4549 100644
--- a/metadata/md5-cache/sys-process/htop-2.1.0-r1
+++ b/metadata/md5-cache/sys-process/htop-2.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=interactive process viewer
 EAPI=6
 HOMEPAGE=http://hisham.hm/htop/
 IUSE=kernel_FreeBSD kernel_linux openvz unicode vserver python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2db327a773e36e95f908fda4ba337fa2
+_md5_=c2c5f8b526179b1e9c06b42b144b2976
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta3 b/metadata/md5-cache/sys-process/htop-3.0.0_beta3
index 3e130bbc8faf..73b2022ea521 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta3
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta3
@@ -10,4 +10,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta3.tar.gz -> htop-3.0.0_beta3.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e497941d87c4c8fb0bd3ceddaec85f14
+_md5_=af4005677599479dfd18fb4f0baf8750
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e0463946c7ca..73147184637c 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/python-ipaddress-1.0-r1 b/metadata/md5-cache/virtual/python-ipaddress-1.0-r1
index ed1736e46854..40874ce7417b 100644
--- a/metadata/md5-cache/virtual/python-ipaddress-1.0-r1
+++ b/metadata/md5-cache/virtual/python-ipaddress-1.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python ipaddress module
 EAPI=5
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( dev-python/ipaddress[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/ipaddress[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=986879006f4368e0cbffec713e02c317
+_md5_=b972e6fb2861fc52831d47518d170716
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index d94b3dc75514..d1d2ddc150a4 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/mirmon-1.38-r4 b/metadata/md5-cache/www-apps/mirmon-1.38-r4
deleted file mode 100644
index 9c006e3eebf2..000000000000
--- a/metadata/md5-cache/www-apps/mirmon-1.38-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=>=dev-lang/perl-5.8.5-r2 >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Simple webapp to monitor the status of mirrors
-EAPI=0
-HOMEPAGE=http://people.cs.uu.nl/henkp/mirmon/
-IUSE=vhosts
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.8.5-r2 dev-perl/File-Tempdir dev-perl/Socket6 >=app-admin/webapp-config-1.50.15
-SLOT=0
-SRC_URI=http://people.cs.uu.nl/henkp/mirmon/src/mirmon/src/mirmon-1.38.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=9e30ff4d685b9b11aa960b5efc15290c
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index e23c4101287f..d7ffd6087d2f 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/falkon-3.0.0 b/metadata/md5-cache/www-client/falkon-3.0.0
index c515a27dcef7..66397aef54dd 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.0
+++ b/metadata/md5-cache/www-client/falkon-3.0.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.40.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.40.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.2:5 ) >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Cross-platform web browser using QtWebEngine
 EAPI=6
 HOMEPAGE=https://www.qupzilla.com/
-IUSE=dbus gnome-keyring kwallet libressl +X debug test
-KEYWORDS=~amd64 ~x86
+IUSE=dbus gnome-keyring kwallet libressl +X test debug test
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.40.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.0/src/falkon-3.0.0.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	1f114e72c01d1e0fdc917ff58938e74a	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8b4e21e9cbf2efc7350339a135baab3
+_md5_=3066026bf690396e2eef6fdd0c55693e
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-66.0.3359.66 b/metadata/md5-cache/www-client/google-chrome-beta-66.0.3359.81
index 49a765697b84..dd134841e70f 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-66.0.3359.66
+++ b/metadata/md5-cache/www-client/google-chrome-beta-66.0.3359.81
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_66.0.3359.66-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_66.0.3359.81-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8a2fdea3123145b076af657b483bb997
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3381.0 b/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3386.1
index 245eb3ef86c1..300f5066828e 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3381.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-67.0.3386.1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3381.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3386.1-1_amd64.deb
 _eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f3bf237a83ecd802a636b64a7996448
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3_p20180125 b/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
index a948f6493181..defcc6b8da65 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
+++ b/metadata/md5-cache/www-client/w3m-0.5.3_p20180125
@@ -4,11 +4,11 @@ DESCRIPTION=Text based WWW browser, supports tables and frames
 EAPI=6
 HOMEPAGE=https://github.com/tats/w3m
 IUSE=X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=w3m
 RDEPEND=dev-libs/boehm-gc:= sys-libs/ncurses:0= sys-libs/zlib X? ( x11-libs/libXdmcp x11-libs/libXext ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] ) !gdk-pixbuf? ( imlib? ( media-libs/imlib2[X?] ) ) gpm? ( sys-libs/gpm ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) xface? ( media-libs/compface )
 REQUIRED_USE=X? ( ?? ( gdk-pixbuf imlib ) ) fbcon? ( ?? ( gdk-pixbuf imlib ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20180125.tar.gz -> w3m-0.5.3+git20180125.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=ecb6f96f1109bf6e77e838e432d3ac4a
+_md5_=8b4fc5035199333d22966d9adf81072d
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index bb9114371cb5..87e56415a285 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.66_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.81_beta
index b044327d3e58..7a17992dbb42 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.66_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-66.0.3359.81_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_66.0.3359.66-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_66.0.3359.81-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3381.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3386.1_alpha
index 196299feb50b..a45ad1c44265 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3381.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-67.0.3386.1_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3381.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_67.0.3386.1-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=867413b03b94a7908f0373ccd5ea7ea1
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index b2bf0c10909f..027e06dba311 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
index 7ad3ffdb0f5b..5222281511c2 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ b/metadata/md5-cache/x11-base/xorg-proto-2018.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=X.Org combined protocol headers
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f1e72b1720ec15dcc4dc329537b6be25
+_md5_=2797256367b97a2d0a96471c2ca82888
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 7c92f4651a4b..51b6fc55a028 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/guile-gtk-2.1-r2 b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2
index 30d9dd785c90..260075a650de 100644
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2
+++ b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ bindings for guile
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/guile-gtk/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-scheme/guile:12[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 SLOT=0
 SRC_URI=mirror://gnu/guile-gtk/guile-gtk-2.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b75c7e811f2f5f43ae7a8b95bea38252
+_md5_=c07835e449770149e5f1fdea449fdb05
diff --git a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3 b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3
index 0e2ddd07bf5a..d8323af034de 100644
--- a/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3
+++ b/metadata/md5-cache/x11-libs/guile-gtk-2.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ bindings for guile
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/guile-gtk/
 IUSE=test
-KEYWORDS=~amd64 ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=dev-scheme/guile-2[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 SLOT=0
 SRC_URI=mirror://gnu/guile-gtk/guile-gtk-2.1.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=32804785955c8085869196f346825090
+_md5_=c7eea406678331614fc4139f9f6adfde
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.89 b/metadata/md5-cache/x11-libs/libdrm-2.4.89
index df4756ce68ca..9b41b0bbcdf6 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.89
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.89
@@ -4,11 +4,11 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=https://dri.freedesktop.org/
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.89.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
-_md5_=810b5e42376bad0d78115acfef249dcb
+_md5_=eb16f76e57e6e7835a35ac9d9f9cfad5
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.3 b/metadata/md5-cache/x11-libs/qscintilla-2.10.3
index 32422a823e6f..c49dbaa3c2de 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.3
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.3
@@ -4,10 +4,10 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/13
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0bdcf82d3f56a942a2544dd47043b84
+_md5_=8efbec8e6804455aa6ca74864a5d0dfb
diff --git a/metadata/md5-cache/x11-libs/xapps-1.0.4 b/metadata/md5-cache/x11-libs/xapps-1.0.4
index aba81c57ff3a..81eb09e1b0ac 100644
--- a/metadata/md5-cache/x11-libs/xapps-1.0.4
+++ b/metadata/md5-cache/x11-libs/xapps-1.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-desktop libraries and common resources
 EAPI=6
 HOMEPAGE=https://github.com/linuxmint/xapps/
 IUSE=introspection static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.37.3:2 dev-libs/gobject-introspection:0= gnome-base/libgnomekbd gnome-base/gnome-common x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22.0:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] x11-libs/libxkbfile
 SLOT=0
 SRC_URI=https://github.com/linuxmint/xapps/archive/1.0.4.tar.gz -> xapps-1.0.4.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7102ed32457a8507c0e14f3427c90ccf
+_md5_=db97b5752edb833a570f87f1b1088322
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 9d02a7e79a19..e0d79eafb235 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.1.4 b/metadata/md5-cache/x11-misc/menulibre-2.2.0
index a62ed0a76d96..31b9bee80498 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.1.4
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.0
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[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(-)] gnome-base/gnome-menus[introspection] x11-libs/gdk-pixbuf[X,introspection] x11-libs/gtk+:3[X,introspection] x11-libs/gtksourceview:3.0[introspection] x11-themes/hicolor-icon-theme python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://launchpad.net/menulibre/2.1/2.1.4/+download/menulibre-2.1.4.tar.gz
+SRC_URI=https://launchpad.net/menulibre/2.2/2.2.0/+download/menulibre-2.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	c25bafd988acc946bfa457eac09621d8	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=068fee3e8e48f1e3174e828b4984981c
+_md5_=01a0b0684e0bead92368652f897f9f18
diff --git a/metadata/md5-cache/x11-misc/shared-mime-info-1.9 b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
index a5442f541bbf..bca6909ba854 100644
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.9
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.9
@@ -4,10 +4,10 @@ DESCRIPTION=The Shared MIME-info Database specification
 EAPI=6
 HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info
 IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
 SLOT=0
 SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.9.tar.xz
 _eclasses_=xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b32f3bbc6b6105e185cb5ff0fdb9dcb3
+_md5_=347a0e589d49821120b8cc462cd84788
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 2a7fa98aa8b0..4714cb59db63 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/enigmail-2.0.1 b/metadata/md5-cache/x11-plugins/enigmail-2.0.1
new file mode 100644
index 000000000000..4dcee0a1661c
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/enigmail-2.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/zip dev-lang/perl
+DESCRIPTION=Mozilla extension to provide GPG support in mail clients
+EAPI=6
+HOMEPAGE=http://www.enigmail.net/
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0 GPL-3
+RDEPEND=|| ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk(-)] app-crypt/pinentry[qt4(-)] app-crypt/pinentry[qt5(-)] ) ) =app-crypt/gnupg-1.4* ) !<mail-client/thunderbird-52.5.0 !<www-client/seamonkey-2.49.5.0_p0
+SLOT=0
+SRC_URI=http://www.enigmail.net/download/source/enigmail-2.0.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f5513e8258e634026f1a988f350dfc31
diff --git a/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.6 b/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.6
deleted file mode 100644
index 64f79346033a..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-xmpp-receipts-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-im/pidgin[gtk] virtual/pkgconfig
-DESCRIPTION=Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin
-EAPI=5
-HOMEPAGE=https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents
-KEYWORDS=amd64
-LICENSE=GPL-3
-RDEPEND=net-im/pidgin[gtk]
-SLOT=0
-SRC_URI=https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents/ckA6jCV5Kr4OkjacwqjQXA/download/ckA6jCV5Kr4OkjacwqjQXA -> pidgin-xmpp-receipts-0.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3e4bd0f8b2cfe1621da33a265c469c69
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index abff9b36a43b..78d48b800586 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5 b/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
index d0780b2e695a..fe72702797ce 100644
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
+++ b/metadata/md5-cache/x11-themes/vanilla-dmz-aa-xcursors-0.4.5
@@ -3,8 +3,8 @@ DEPEND=x11-apps/xcursorgen
 DESCRIPTION=Style neutral scalable cursor theme (black version)
 EAPI=6
 HOMEPAGE=http://jimmac.musichall.cz/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_0.4.5.tar.xz
-_md5_=6079de8a94ada6e7a98bafc204772d79
+_md5_=62c17152f396cbe7a9b005515950777d
diff --git a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5 b/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
index 43be9dfbf992..3a518dd89a76 100644
--- a/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
+++ b/metadata/md5-cache/x11-themes/vanilla-dmz-xcursors-0.4.5
@@ -3,8 +3,8 @@ DEPEND=x11-apps/xcursorgen
 DESCRIPTION=Style neutral scalable cursor theme (white version)
 EAPI=6
 HOMEPAGE=http://jimmac.musichall.cz/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_0.4.5.tar.xz
-_md5_=57fa4b6d94e52ff479bdf32cf932545b
+_md5_=fa26693cf75a9bf6cd3b2aca2748f4d8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 6e5c9adc8df0..3b5b8cd0c1f1 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/ctwm-3.8a-r1 b/metadata/md5-cache/x11-wm/ctwm-3.8a-r1
deleted file mode 100644
index 77bcb58be2a0..000000000000
--- a/metadata/md5-cache/x11-wm/ctwm-3.8a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt app-text/rman virtual/jpeg x11-misc/imake x11-proto/xextproto x11-proto/xproto
-DESCRIPTION=A clean, light window manager
-EAPI=2
-HOMEPAGE=http://ctwm.free.lp.se/
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt
-SLOT=0
-SRC_URI=http://ctwm.free.lp.se/dist/ctwm-3.8a.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=60cbdabc3a1b534e6a6bab4edd153e90
diff --git a/metadata/md5-cache/x11-wm/muffin-3.6.0 b/metadata/md5-cache/x11-wm/muffin-3.6.0
index 21a07f866af9..3772950f2fd8 100644
--- a/metadata/md5-cache/x11-wm/muffin-3.6.0
+++ b/metadata/md5-cache/x11-wm/muffin-3.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compositing window manager forked from Mutter for use with Cinnamon
 EAPI=6
 HOMEPAGE=http://cinnamon.linuxmint.com/
 IUSE=+introspection test xinerama
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.14:=[X] x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.9.12:3[X,introspection?] >=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.4:0=[introspection?] >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] >=media-libs/clutter-1.14.3:1.0=[X,introspection?] >=media-libs/cogl-1.13.3:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/libXcomposite-0.3 >=x11-libs/startup-notification-0.7:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender virtual/opengl gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/3.6.0.tar.gz -> muffin-3.6.0.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a805883641bedca1b7a58d8d39b637c
+_md5_=8ad28d71d8bc5d7c0c7878b4f2fc2fd2
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 74bd80173352..05880c8bd792 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.15 b/metadata/md5-cache/xfce-base/thunar-1.6.15
new file mode 100644
index 000000000000..a8e4112e015f
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=+dbus exif libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+REQUIRED_USE=trash-panel-plugin? ( dbus )
+SLOT=0
+SRC_URI=mirror://xfce/src/xfce/thunar/1.6/Thunar-1.6.15.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=131e245cbabecb319170128b2c6c98c6
diff --git a/metadata/md5-cache/xfce-base/thunar-1.7.2 b/metadata/md5-cache/xfce-base/thunar-1.7.2
new file mode 100644
index 000000000000..d47bdcf5d8f4
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/thunar-1.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm test
+DEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=File manager for the Xfce desktop environment
+EAPI=6
+HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
+IUSE=exif introspection libnotify pcre test +trash-panel-plugin udisks test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-3.22:3= >=xfce-base/exo-0.11:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfconf-4.12:= exif? ( >=media-libs/libexif-0.6.19:= ) introspection? ( dev-libs/gobject-introspection:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
+SLOT=0
+SRC_URI=mirror://xfce/src/xfce/thunar/1.7/Thunar-1.7.2.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=328aca5972107793132bf6c0b9bdf3ce
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2ef8dae9d1b4..4ba1020d3504 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 19389 BLAKE2B 7284bb20afdbc54d8fd10daa6eb23af34e945b7de42dc8636dc389c9aed99f768d74320549dacb305de33c63f2c9137b1cf164cb6f2c633dfde66d4866cfdab2 SHA512 f51acb92afe4d097909da2fa27ac72f1ec0347e9d8b12fc0e002557278915c403b4870c0ddabbc2fad68799e6ad2cbd835fb9cc74577916255a94d1f3d50a682
-TIMESTAMP 2018-04-05T20:08:26Z
+TIMESTAMP 2018-04-07T11:38:26Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrGgjpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlrIrbNfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCjKQ/+IXAACYGyb0FCNqhPy7bCxgshXsx/dn6TU1Q8DIo8Z85FiFXzOkaQW+pt
-JTiTw2gjGW0dbqdkSj+DDUFQyjbMV4xOKV9aSbhHSvcEUsisGAGqvhQBWh0SEPv+
-Uu2YZxZCQcKyNqNuHhjMVWoxBVhzaN9FCYjtBiZPcwX9qI9pHV39LpT22Ane67+e
-kzB32TKdM6MJU2CRUPtV+Di1AYtrqevi1FvUwyaXH5Ug6X8X31vVZqV5sYnQW1gX
-LIJ+mN6cx08LcfI+QVhraqw8PGo1wIdQ9Jvda5Rlq1wUoWQr686eK2IOrckvo1f5
-MT3CIVHOw7JVxCcRsmobAvju6/GtbO/TxGPviCphTYRQsW0NL/ZuPJ+x5QL6tv3y
-k+OYKcs4kqqXqKz/A4sSSonOSRsvL//FGEBgDrf00nL1aqrkhWvVVXmGKE/kdCOW
-Pz+LGqdVeoP3Mj+mt3RDab9Ws5aaEt1Bb/PG9Ufre+ljN/mppWOoJHBtxH8Df/km
-OZjTpnw8j8N1ibmxHeCidxWZ6C59S6xo/0TorJUPyFE2Y7LsGZ9hj1hkqzZ1AE/X
-BoffjwzlWH0e10Xa/APZvrBrWOwDBdJX+733Wco6iB+bh7lAnfH4bFfe047amWR0
-I8Kgm1BrnsFOOcZ79sWxLgYvd5ad8mv8pasCzI8b1IxfG2u9CSs=
-=kXjY
+klDvqw/8CY0sd3Np3XTFPyTHvueMiqW2kEm3NFwEb/ihN35grHoxe30tybIDbxqi
+QZKclluoDzu762sbO1FgqsxR2TQlfYfPjqFqT1mam7O8Klohd6Pawdxc7aAkv6MQ
+AGCPjqJjJwy0mpqHjqAnG7Bx8mSFgDPd2g+S0XbSAE8KjvI1jZftG7lio+axRt4v
+GGvPVvlLm9qiOmoV7BagUh0Do1BnR0LgUbI97dioKUQgSpgtLEclCnXyh73hvJT7
+HdIGymikayG8zDGQ//Yn7LPAFf7bScx9kE8dh5uE+qy7S0um3gtwEkxdxlMlfWi9
+uSjycqZJOO7KwtJ+bpXp1VvujalX8L/h5EXuAi1hWXWrWIRKxJoMAumnV9EnTW3l
+0smzJLKcCT3UlNy5lKHDsoScMdbI0m9uKRUhD4IrO3qH/mMPUvyt/JvHgsjo7K3s
+G29e2K7zXHyXG6ysZ2up27BFCM3xFvbt5Qi9R/4M5cqKxH91desjekzGZO9LFI9a
+JJkL1gmS0fA1lk3gF/gFRN2bWAobwbkfqzvDbCHhW+q0iNsmJBE4zbZ4a16SqKeW
+y+OwdzBnWdovfaQCuK9g1833q5if2ydSHoIByTgoUEUr2SWnGaFqhkRd6Sa6zyQs
++dRz4nZ/Ndw9ugz5f2lYCR2xr8yjOSWyepfRyUha0s+mO/cNGZQ=
+=QdgZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b635badf5e6a..a01a4cb82d0c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2018 20:08:23 +0000
+Sat, 07 Apr 2018 11:38:22 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 351aaaf505f9..d4f6ee666646 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Apr  5 20:08:22 UTC 2018
+Sat Apr  7 11:38:22 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8f64d9191d7c..4d66d43a7ecc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2018 20:15:01 +0000
+Sat, 07 Apr 2018 11:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index dc2f875d2b8f..65dac13e1307 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5c9b400a50c380a642684cc06155767d8b7d4888 1522958663 2018-04-05T20:04:23+00:00
+7836e00e0c7c06a845a313cce6b487dd00fb45d6 1523100010 2018-04-07T11:20:10+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 89cf8d7c3a02..7e7f54bc5bb5 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1522958701 Thu 05 Apr 2018 08:05:01 PM UTC
+1523100901 Sat 07 Apr 2018 11:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a2553f1e1280..a01a4cb82d0c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 05 Apr 2018 20:08:22 +0000
+Sat, 07 Apr 2018 11:38:22 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 43f89b7aca22..2de74e78f1bb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/check_mk/Manifest b/net-analyzer/check_mk/Manifest
index ba0395753f9a..215f318ab949 100644
--- a/net-analyzer/check_mk/Manifest
+++ b/net-analyzer/check_mk/Manifest
@@ -4,4 +4,4 @@ DIST check_mk-1.2.4p5.tar.gz 6626768 BLAKE2B d8f40405d443cf4d25cf53ac4adff4361c7
 DIST check_mk-1.2.8p16.tar.gz 16298683 BLAKE2B 5023719c3e2e56807900ccb204862eccb73706bb23dfa3dfb4f30cb6fa592828e2d81aef12dd5129b280c37ca8d700c982f3b29469fd5ec0328e91e414b8c624 SHA512 601c76b2b62de9176122c69b011b5f7ac6b71650d1b3e411c103f5e9c3e91256ce8d3db6fcd1edc2a11f86dcba4e8ea18ec5a1f9f3eae5b25a4bb3ba712341eb
 EBUILD check_mk-1.2.4_p5-r1.ebuild 10413 BLAKE2B 165de0f771a135992e10e5da96e07cc52572002befd5ae16817de436bb095694e96e90d9e1403851bc9a1b1a0e4127ad54320da979263d9da3a8c9bb93396090 SHA512 54e0855c1f6c80596d580db0dbd61478cc4ea5a15c1fbc3cd3764c5547a0eddf7d018a4e7345fff6c0f6f9960e1273552f16194d9221fed92d5e5a7c82f581c0
 EBUILD check_mk-1.2.8_p16.ebuild 11335 BLAKE2B 7af3e2599be0bea866fff206fbfda2cfa570c1fb691e99f9fb33416ca75e6f9af11c354b0f038fa84573c8420614ff024d900e908b610264e7d0cee700c693b7 SHA512 af1945acdc4314ac018343b3d7323b9997f2a041de5db6cf6f6b9cbbea623c714b1f5f348f4fa098bbe183e701164ef6140dc1ec63db274bb16eda6b42acf0a0
-MISC metadata.xml 1700 BLAKE2B cbb0d6296394e7ad1fda28e5da7125606f305ab7f328ab17cc907dc01805bfb99e484662d2f9442c8a2639abb5b826e7dde8a21860fba7437a4515160627c496 SHA512 eeeb2be92120196d1cb9834c4465707d43cdacc1ecc62d9a71e8c10e4b5aa14b7b7078193d0c093be3bb64ff4f92344a3e6f04cbb71db40ea4ce4eee446e0b38
+MISC metadata.xml 1507 BLAKE2B 9a52c3006f34fb08b7dad49633c7d3630cbff714e76d22e9bca6f8e24c0f290f82a4852e7bc5df7804d27bb01c85f929c0af2fda64a25ec9e7b12dfc660d4dfe SHA512 68ba95e5fe9b7f49de5f1db404f40633229627220eb737440cac5967181d1f97feda2e0d7f5af85c3f2cf795a3fa56ab22091b6f186b3dda379ab6005de59586
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
index 2e0e199f3a40..e7ef436d1159 100644
--- a/net-analyzer/check_mk/metadata.xml
+++ b/net-analyzer/check_mk/metadata.xml
@@ -1,19 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>morlix@morlix.de</email>
-		<name>Timo Eissler</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<longdescription lang="en">
 		General purpose Nagios/Icinga plugin for retrieving data.
-		Check_MK is a collection of extensions for the IT-Monitoring-Kernel of Nagios/Icinga
-		and together with this, and ideally also with PNP4Nagios and NagVis constitutes
-		a complete IT-Monitoring-System.
+		Check_MK is a collection of extensions for the IT-Monitoring-Kernel 
+		of Nagios/Icinga and together with this, and ideally also with 
+		PNP4Nagios and NagVis constitutes a complete IT-Monitoring-System.
 	</longdescription>
 	<use>
 		<flag name="agent-only">Install only the check_mk agent.</flag>
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 068ef0483e6a..0f22fc48c14b 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,8 +1,8 @@
-DIST fail2ban-0.10.1.tar.gz 465197 BLAKE2B 1e9ed7d07f4565f49e6ebec9ba1ebbbb9835d2eab69d786672addbdf32b2d350a582927cf56722eea91c1420e2d0d7d7564c2739d412c33f639551fa83a7d4ad SHA512 80170082903b7d92732a7accd8ec5188f4b08b57ce46c2df9bc014771ab50602df2065abe87ccb890cfba41699f5441ebfe4648090ffcedb83e0374e509002f2
 DIST fail2ban-0.10.2.tar.gz 474675 BLAKE2B 569599eec3c7b786933af332507ca148f49d38688f7467d3d9bb811353402646136fb28351e593fad0c95de4ece4ac4967d8215430827e8f5a2a52a6ea61a3ca SHA512 1c16682b3cbf26b5aed1bace4c09ed911e487fbd01f8e8355f2427dae85b86d1d28e7a18948ad66488393115c1439e9daf634f2edb8c3ce7ce8639aa53e35503
+DIST fail2ban-0.10.3.1.tar.gz 485826 BLAKE2B 79ca86a601bd79ba3729d4c9b00f20a0717df8c7ceb20183099e11f84cceade274173be90d0b4b000d37a1b9d242e14106c9e7e40e372e450d69bca003fff6fb SHA512 ed3646ef2113fe10d9130c239818087b228ac9708411e26acc412beae022e3f9ff8cea32d824bd491117882fb8f184dcb88bda295bd31e865ac8310c7e27fc7a
 DIST fail2ban-0.9.6.tar.gz 352145 BLAKE2B a529a7a1c78f29f457abc26215da015f7624f6d777571e96725775557725b6cbbfda5068e77520f1b3c20efcff07c11f210c5cca3ed47cf86c6f5e87c503052f SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e
-EBUILD fail2ban-0.10.1.ebuild 3349 BLAKE2B 44a20711ee008c33bf776a5d377ea8496676639d83676ea204da25ec8606c6ad12a60f90d1a9668ad76f3fd910363a0b83b020398e03ab4e7ec373751ab62244 SHA512 77e18c3160db5a1fe504ed5226c29201db52b2c23fa38401ba757d114675194855e524ad2ee3a0aeb817411bd3ace42ff31be1fe053aecf909b64a03cd0eb038
 EBUILD fail2ban-0.10.2.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
+EBUILD fail2ban-0.10.3.1.ebuild 3349 BLAKE2B 030c91982ed07d229c72605bdb80648596a686416d6e695cd8057092bf9a4167a39b23b38d234c3ed91879f897c899d64a3f1b6fa7fc1c9828641b8f8e8a2e8a SHA512 d818e7e00258bccd14540ebedd427f3e05dc7b5feef3138a80123425726388d82e21b0f49ce71fd5e15a486a4042e4533e28e0a947941a985c78ae98939e7584
 EBUILD fail2ban-0.9.6.ebuild 3118 BLAKE2B 421153aa5ee52702e6cb79dd780ed3706b22c4ee7497c4da505cc1a2c7aee27c80ad737b427e4de3abcaea129add9b9b70e008336597ca2e57bdc6d08dcda790 SHA512 e10fe1a544c0ea50eade24a3399cc2e4f27a0cbd4e4455a2cbc48cd1def13793474a24f4eefaefcb4ddc5c3e3773821c6149001c83ca953db3be1dcfb41d30b0
 EBUILD fail2ban-99999999.ebuild 3190 BLAKE2B dac84d04dc01c20b5af2a34c07be78ce7db25c79d00a5cfc7e6c58b4077e884b71e8fdb83b34e9abe7326c68836b3963d6ebd373bb618e74db4f13cb7464e086 SHA512 8b2a59c16a2a9bc712c7d905a30df88d72ebf47e5f89e227bd1371ae35aa7d44c6056c1aef7c9952ae166b0bab806e8a21ee584eff36652df43d0cc668f237e5
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
index ffb03e0fe708..1efe5233391c 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 0039af306fa3..9ef3039c95bc 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index ccb0fe977fed..7600fb7a2862 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -6,4 +6,5 @@ AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500
 AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
 DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
 EBUILD epic5-1.1.10-r1.ebuild 2211 BLAKE2B 66eadd474ad71e72267844f1cec015b4fd12ce811d55262df74b7624b0f36fbc9151f4e1674146afaa47a4ef8b95a4a88b2557b2cacabfac96de8a88630d6bd2 SHA512 16c5a47784f0d8ed534b8f269f693497be01079b3b6a8fa563f36116f3aea65f3af829af938db002775aa59613e09281cc1b4071710065d4a8fe721c000ad6d4
+EBUILD epic5-1.1.10-r2.ebuild 1852 BLAKE2B 56029b98239501cbbbcf5aaecf65ad1ad9b7203a25c48fbdf7b285d754ed859fdddd8cfc67cab827818778a5fe78d906e4de208c975b5a9efc3ecac18a058a5e SHA512 f515d5b88fe3e9486e97416e2f671bc515eb3fd35c4d7faa0411dd6cb679b670934fcda96220098afc4e9d4a7d3d6fdd57d01cd96c2c4dba16c79dfbac64d4bd
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
new file mode 100644
index 000000000000..323296c7006d
--- /dev/null
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23"
+
+inherit autotools eutils multilib ruby-single toolchain-funcs
+
+DESCRIPTION="Epic5 IRC Client"
+SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
+HOMEPAGE="http://epicsol.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.8e-r3:0
+	>=sys-libs/ncurses-5.6-r2:0
+	virtual/libiconv
+	archive? ( app-arch/libarchive )
+	perl? ( >=dev-lang/perl-5.8.8-r2 )
+	tcl? ( dev-lang/tcl:0 )
+	socks5? ( net-proxy/dante )
+	ruby? ( ${RUBY_DEPS} )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+S=${WORKDIR}/${P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
+		"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
+		"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
+		"${FILESDIR}"/${P}-without-localdir.patch \
+		"${FILESDIR}"/${P}-socks5-libsocks.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# Because of our REQUIRED_USE constraints above, we know that
+	# ruby_get_use_implementations will only ever return one ruby
+	# implementation.
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/misc \
+		$(use_with archive libarchive) \
+		$(use_with ipv6) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with socks5) \
+		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with valgrind valgrind)
+}
+
+src_compile() {
+	# parallel build failure
+	emake -j1
+}
+
+src_install () {
+	default
+
+	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
+
+	cd "${S}"/doc || die
+	docinto doc
+	dodoc \
+		*.txt colors EPIC* IRCII_VERSIONS missing \
+		nicknames outputhelp README.SSL SILLINESS TS4
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 1ebb187d104d..069ddd80f096 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 49f3d8f2b9b7..47c420c017b3 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,4 @@
 AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1300 BLAKE2B 1693015cf84a991cfd62eca92f90e374485cf143485beceeeeaa319ebaa558f5ae5cea3de34afbf7727d6acbf195b8641abe05f2edbf93149a1509faedb386fb SHA512 94e121027fe9ed617bfddee24cbc975a3330980dce1abf7515ccfca1c74d6b29bcebd991e3ecb2d67f397513e79049f0ae3d08889432e6d235ad7e58fb7c9ed4
+EBUILD libgsasl-1.8.0-r1.ebuild 1311 BLAKE2B b1c10e23e19ccbb57834317537225298805a034016048324666951e46e1ffd91492e763c911a2010e73f110ff06a6fee0049214fe4a0025cd9b0a6571c7ce01f SHA512 50beb4f916f43b8f4fca692a577fa0240ab7d932ac5eba3cfb7d3cc4be771d7732c92e216a3c941dfb7fb1fd68555ae56ec66439c57fba10ab46510423907038
 MISC metadata.xml 441 BLAKE2B cca184337b787574365c5887bbb37b5660af2d43a0aac83635f00b24c56861a41c59ea07c32806327dade6588a754e366787de38efd7fffc314d01cd73a33533 SHA512 cc5006f1d1b90b71cab02baa92eb82485161248a3680807a461ce7af38a4259d80eb831341c8b42bf764c6b76d4c8228d80966657c6875221234ac66f7d35e89
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 33b6be88f5a9..360cab48767e 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt:0 )
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 48493c306dd4..94377f1547a0 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,12 +6,14 @@ DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e6
 DIST node-v6.14.1.tar.xz 15758180 BLAKE2B 63db5d1f73cc16f5c73012953799193cbd58da3aa92d3d48c5419d4e5c4e9126a2eb45b7e27e7396269deeca7836cac62c5f89e5d23b695a3455305739d5df90 SHA512 c1f725c76bfad914d8d607e1d0bddbb6cb75a99adcf781d12291830bc41610ede346a5ab29648d16ad8bb3031dade89f7f4e16708083b5fcda2def965f0c7d21
 DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951be7a644fafbfcac9cce1bf33ed8ca47929e0a5d0df72034a6c2b967c578e3c78a2ed27ba85e41c4af1de2307293 SHA512 0ca0dead15a1623ece7f972d420dec623141a795ddd984c32ce7e92ae32ead97bb0153ebd8c1c249b91a1bd6efcef7fb313105455f66d4d181473153c4e0736f
 DIST node-v9.10.1.tar.xz 18456696 BLAKE2B 104f92701147d47d02e5cdefe3e866220267f8459a27c0ce81154a11cad72f13be8107efa8defd8123e1abc6984462621407d4b81f3a81d869fcf221a85233b4 SHA512 f94564a62fdce80b4ac946e6161e22664f372adf46e3baece17c1733eb9a5b850b43628f131653144bf920364933d0e94f21d1c5404f2388b2b9d56743d02e94
+DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4433 BLAKE2B c5c073d61215f80b3a80d150f867e8392d053b6480df209c9486ba4f9f081d4120cfccc0a179c606dd5a96d909f19ff4198351d800d10bb262b7e9981cc87c3c SHA512 c037bc483828db1ea11ac0ad379da5453a9f263fb3298d20b897346ea18bd54f8820365846cf092a4fde1bfb1e8b86360b4d45e0b467cb58193f4f556beda342
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
-EBUILD nodejs-8.11.1.ebuild 6349 BLAKE2B f3425619da81f9b00acea4e1274785f3f8d50456506a9253ab4c3b081057ace6a03cd7609aaf6ac3b55c490f3105a7de80b8fdb6f6c7e41a95d6c086e8c89893 SHA512 a8aec75365ee146e675961fa24d8f42b088393894dae9b0c3047779faef60f06cd26bc269240ce6a49af552e7ae7585b550d0b18f058bdd6aef89b0a6ed2c80a
-EBUILD nodejs-9.10.1.ebuild 6334 BLAKE2B a1e88e53bc3d50614f0addc037a5c981858dcf091776eacb8dc2e55af268640eb657fdc11703da9b22354b7349f8f639670307e8797dd182bdce0391339bb658 SHA512 4b2c9a6df410f34cce7c4d9288c04ee871f82c4d847dc3853ab752b9151dde81f2f3ca26ac0db23512b5fc72b77d4d79eccfa87de2350d9d09ebec8608354719
-EBUILD nodejs-99999999.ebuild 6265 BLAKE2B 18838dacccdebaae807f9b95f60cd265b8b94779462cd5b6801a979d739f974e53ec5157076286e3395b2d3eb41c3f38b817d3463a07bd7e316725691ab514fe SHA512 32e7ef3c26cfc91eaecfd806edd141a26825eebd3e9a8e82f0a6981a0434532027b8fa76ecc60826f30a58c6b565705bbb42ef3f2ccba8da1ddd129abe1f9a03
+EBUILD nodejs-8.11.1.ebuild 6349 BLAKE2B 808e3d4b84f7e62b0cdfde3cfeb43910185603f26079353954074cd261ae91d1c4dc76473242ad45a8a7c7d9a307e5884053bdaab888877dc054c5d53d6efa8b SHA512 d86349a73553642202de8b50ca1e64988c709e1d65e0b95b2480d052d175013874d37adf9a7c27f3338eabdc39c76c8d07e2462d0bc6eb3595dfed4f8bfec1b7
+EBUILD nodejs-9.10.1.ebuild 6334 BLAKE2B 2e203252708484f770ffc8e1d9c43f299df3fca92aba0c6c107fae103c183d1c14860fbefaa7eb3c9d4f07dacb70c97704726e53f2108ad4cf537e8b01361b62 SHA512 f0fb1d5db9a8c18838a37545906cfd939f19d261e29c4adde967e8f5e0e2a8064bc275f4ae06cba07b0b9debc0555bc804a1ed82f84264adb3937cd054e0129f
+EBUILD nodejs-9.11.1.ebuild 6334 BLAKE2B 51236f25ddb70527867a9ceb89d77872627db453f74c909d0a9a57457b4814322731c9e5d6f93f9f5b37945bd35bcdda924834e22ce19c1eaf97df3873488ade SHA512 45035c68b6202f9aabd12be127674b89811e0192dcc5604969b27b85a4662a2219dfa6e507d40d7fb5f8e9643c49e755f19ba686fc611e83e1165e03fdb1c566
+EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
 MISC metadata.xml 573 BLAKE2B 89ced6a86cc67a80119e520991d1de3229be3a777ff4f7b49daa8854c470e3f7e3335681028ce3f18d3acfc8c01057dcf5d0597becd76ef95fcc50b3b214c277 SHA512 231bb23c3dd421ea5c618bfea3a70225e089e6c2eed74fc80ca3becf3f84072dfbfc02a100083ac533a0d95496ce2ba802e1ec65e64659afcf2e70e638b7a2bc
diff --git a/net-libs/nodejs/nodejs-8.11.1.ebuild b/net-libs/nodejs/nodejs-8.11.1.ebuild
index da6d42a8cea4..7d376f899efe 100644
--- a/net-libs/nodejs/nodejs-8.11.1.ebuild
+++ b/net-libs/nodejs/nodejs-8.11.1.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.19.1:=
-	>=net-libs/http-parser-2.7.0:=
+	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.25.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-60.1:= )
diff --git a/net-libs/nodejs/nodejs-9.10.1.ebuild b/net-libs/nodejs/nodejs-9.10.1.ebuild
index e73e3ad02511..482fd71177cf 100644
--- a/net-libs/nodejs/nodejs-9.10.1.ebuild
+++ b/net-libs/nodejs/nodejs-9.10.1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libuv-1.19.2:=
-	>=net-libs/http-parser-2.7.0:=
+	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
 	icu? ( >=dev-libs/icu-60.1:= )
diff --git a/net-libs/nodejs/nodejs-9.11.1.ebuild b/net-libs/nodejs/nodejs-9.11.1.ebuild
new file mode 100644
index 000000000000..068d8fdcddd8
--- /dev/null
+++ b/net-libs/nodejs/nodejs-9.11.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.19.2:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-61.1:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 62953844e687..1e76d8f64f67 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -22,19 +22,20 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.16.1:=
-	>=net-libs/http-parser-2.7.0:=
-	>=net-libs/nghttp2-1.25.0
+	>=dev-libs/libuv-1.19.2:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
+	icu? ( >=dev-libs/icu-61.1:= )
 	npm? ( ${PYTHON_DEPS} )
 	ssl? ( >=dev-libs/openssl-1.0.2g:0=[-bindist] )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	${PYTHON_DEPS}
 	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
+	test? ( net-misc/curl )
+"
 PATCHES=(
 	"${FILESDIR}"/gentoo-global-npm-config.patch
 )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 13463ecf02b8..947b38e30fd1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index ef4ae1ab26a1..1b7161a56093 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,5 +1,5 @@
 DIST aria2-1.30.0.tar.xz 1497124 BLAKE2B 99bce103f1bd89b94e202cb7b2d9dc427398e0dec3517b25a3870515433b7be35fe2841b5ace049771181e6ce44acb82f8715c72347e7069acd6b003e33522ac SHA512 8c3deb4b58b9db9e8de52f48f6e863e07743ae4af14e2b2d64ddcac94b6aec16ff8d4f27e7d6076426d597af9e6e0988289f3a1c156796c9d79ee7f60f5edc38
 DIST aria2-1.33.1.tar.xz 1505208 BLAKE2B fb74add042d0cda81ca1b9c9d9b27b559ba859829c681520d6ece6322411f139667a1eaddc6f8aef23931e301ba4aab599ab17595df8d6ef477000f5e8fa83f0 SHA512 5379768a0960e46ed616a2540508d0dda4172c8d1a05021e50243241adb64448f5fa01878868ea206ec6b462fea39fa82284bb0f78ceec299eb289f94815b94a
 EBUILD aria2-1.30.0.ebuild 4270 BLAKE2B a3dd69cd5a6dce0c86e48c3abad321d16223834508778e2a850aa89fdfc2871b8f6b7d21ed15af9fd0572f4875119f23766e8fb4844f8ceb4008e551afcfc975 SHA512 308fffeca540ccef4f9b2c86c895d1783e73ef138274b8d4a3d9f4eec7a921c7dd51ec6e0e0fdd1f08a4b988e1a8bc3edfa11c3ab3499d8009980c29ebe7af9a
-EBUILD aria2-1.33.1.ebuild 4271 BLAKE2B d7d4dc030160ae62698574f5c72bbc4d119e28d926aa39dc018b8d3ac2dac24c27ddc5951d8ab4f2e08b2141f9e3c36d15ee2ae9d05050bafb60cd54f6a737ba SHA512 92a5b96a718e6ee07c2eb030d28dede399f6fae538bc745508ff79ec601650571e0401b5a7a091e79f80213c08448f92aeea84babe2a81890c144748a9ef631e
+EBUILD aria2-1.33.1.ebuild 4270 BLAKE2B 7859c2f375b50835548cb43e0c0409badfb5c687a0000d2be8eec2f69b064d66fe23b89849b7755c0fc810e1ac7c74fc8eb1237c2a9c5817ba7c1b0c3ecb7aa8 SHA512 15ccecc031ad82024d98e87886d61a8c5340438210a692371b457906bf1611d3b1fedeffac3a6a94b8bdad28207fb1d5a32f1c8d3b7cc65f8e740a1fdb3b5af0
 MISC metadata.xml 1325 BLAKE2B 83433182337142e2aa760993e9b259c375158d834537052c816fdf81543aec6bb1786e3fe88dcc5d9f2fa9939ee357e470de2043998b30ffc5864d46e8cb5c86 SHA512 2fd19122ed71fd5bb2a50285bfa022f6f69fb0b5f610536d7fb71da5ef923c97743c0e2d228ba8712b818da526abe0bc60cb6829bb564d33d2cbe0b8aa93613f
diff --git a/net-misc/aria2/aria2-1.33.1.ebuild b/net-misc/aria2/aria2-1.33.1.ebuild
index 0ac749fc2764..2253873519ff 100644
--- a/net-misc/aria2/aria2-1.33.1.ebuild
+++ b/net-misc/aria2/aria2-1.33.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://aria2.github.io/"
 SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
 
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 3f3b367115c1..916bc5c128cd 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,6 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-EBUILD bird-1.6.3-r1.ebuild 1274 BLAKE2B b73fbb570a5a579faba135796fa5a65b1e701bab3d4d8869bd65c4b31dd3b8e9d3a128f918267b6dd1df9b7e4c24d166182619e52eabd7021132ef1d937fc125 SHA512 0ca858013e7abff7ec60f2089c9926e5acb6364e042c960f9d33ab232594bb7d2414df798c3e22ea1c2dd464585fbfd8b67d8551289503685d6bd747db1c2080
+EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3-r1.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
index 3bfce423950f..5b0b890c824c 100644
--- a/net-misc/bird/bird-1.6.3-r1.ebuild
+++ b/net-misc/bird/bird-1.6.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
 IUSE="+client debug ipv6"
 
 RDEPEND="client? ( sys-libs/ncurses )
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3e0b439fe1dd..c75d825a3ff8 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,9 +5,9 @@ AUX chronyd.init-r1 1637 BLAKE2B 046896f6eaf0a9311a9b3cb7cc6360f4bffaee95067efde
 AUX chronyd.service-r2 261 BLAKE2B ac29cdd2e717060b5af68608db8a7b3dd8aeb90225edc5b48ea84a8537017d531519a00fb394934c270eb965a615b0b53188bf8bd16edd645074b497ba91fa9e SHA512 671415208e123628e123575d708dbe4ed7946bc45832dce506d539cc747e84ae63783b53398e96a60d815f1758fe44836f34d804e28859538cf560715474dffe
 DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b4881fbd0e19d966dca86ed6973c31618b1ae56b59cad989144bf59a0206328d50d9eb436fdb058684e74a1661 SHA512 4ba3a75c3634050bb63ba9ee80d9be7a295f44ce4d195a050e4be4738bd7dd807fe37f2289d7ead4a75272bd5ebadbd03c233c67f859e9b68871fca5a6671427
 DIST chrony-3.2.tar.gz 433882 BLAKE2B 4351cd22efbb2c819f09a562b2e0c1851336f8973b37b3015ec6acc04b925e13c1207262d4561318c187809bf989710d9a8fdf54e93b3d3dac56d0d6df8782df SHA512 496af5bed91600f268c1a0fa577bb8c7785e485f78598b666829c674e94770c16548cec4289a2ae9d0a51191d2705eda00886cb6cccae3828aa201a49d4783a4
-DIST chrony-3.3-pre1.tar.gz 442045 BLAKE2B 122a36e46b5d5a3eb3e2d5e20ad2a5b4f419e496b9cd341e4895e6a4121f0c613860dba0375592ad169e3dbfdbdaf812f07124e6f3b005eba6b3296a663f601d SHA512 39bb4788d362d9aaf30b84c59eaf3421110c3776d57eb955f12d8fdd6013f8ffa91a6ff1e8b0018113f63d660570b1aa70d96f7c31faca29d5b720c2f3f1d625
+DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.2.ebuild 2912 BLAKE2B de9d8eda478642e023ac95abc3009930644354ce75e145d989a003a61c1273ddb17e2a29255cab98199cc74c07553f866a85355b9255ed26a276abdbbaa08b34 SHA512 846d29b2b4fb9ff2c250a0d07a5b31ddba0e0c8e08ec625535ae7143f271f6f751a155768ddc91f474f75b677bf158709304b38c43e904a51220ca6f2b2bc612
-EBUILD chrony-3.3_pre1.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
+EBUILD chrony-3.3.ebuild 2912 BLAKE2B 44df07e01650a66bac1b2c0e88975f7c7ebde7ab58156ecc0dc46cf0d3189931b53552b2342da55ac6091b1a426809e5733bc38c0528f8d0f000e2d32cbf584d SHA512 8bb57308a4c506e46a101111584ab8fa9a01e0ee86333e2661a33a70d5ae73cf92b5dfc8868f588551b9a4d6f892cf7c5b951556b777bc7c936cb44ebf157966
 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.3_pre1.ebuild b/net-misc/chrony/chrony-3.3.ebuild
index c3aed38aa99e..c3aed38aa99e 100644
--- a/net-misc/chrony/chrony-3.3_pre1.ebuild
+++ b/net-misc/chrony/chrony-3.3.ebuild
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 94ac93edf52c..a4740e254fa3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,10 +5,12 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
 DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7 SHA512 f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
+DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4 SHA512 a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
 EBUILD dhcpcd-6.11.5.ebuild 3281 BLAKE2B 6d98c09002122c9044e10aaaefe442f941db4686227d6e7a052c96dfaab68c276f9fc6b3230d3ec0bc9fa4f6fb0ea5933b574d23fd8860cf1e33c3a4eb10121b SHA512 94b13653b8202a4c402f1f52618a9f5bc414cb92ab1376098dc70e12dc5fb963ebb83ba517b100eaea0cd2cc248152b038115ef14e588abb0ae78c024c13316a
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
-EBUILD dhcpcd-7.0.1.ebuild 4442 BLAKE2B 24b800510b5c594528a1b4436c16bfc0058e2105737ab51a2cb9daf81cddb3a798a3c25abe25f7e6a6234b9492ae493f08ff026d4338ace86d75fc70e221583e SHA512 507ce6c0b2011b1ee862692ff43460d54f5dd099dcf43e635def893e2e9d370d1369344c2e0d093563dc195ef23dfe62d9eb730d65325fae0a0e5f55f18b7331
+EBUILD dhcpcd-7.0.1.ebuild 4440 BLAKE2B b88f219d63bbe67e60f5a229f4fd0996fae96ad9411204ac734a55d7cd10dc106672b83e5ed869f710535aaf5001f2215fdb248fea26de01749eebba8eea8185 SHA512 9c1b7c8a444926924db016ae97ecf050e0f97c59486cf125ca770c0b6dbddc7e7184561c1c52f4a19e3e6de11fb28c3d942af0eb82e76698b82aeb28ac5ae8e1
 EBUILD dhcpcd-7.0.2.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-7.0.3.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
 EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
index 6672bdcb8c6b..2f54cf9351db 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
new file mode 100644
index 000000000000..3d93853bedc3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 769d4f88bf4f..5704e652a7c6 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -4,5 +4,5 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
 DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
 EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
-EBUILD gerbera-9999.ebuild 2508 BLAKE2B e283d466b40434f1613ff0677ea80de1c80b000812a02c8cda6a879b2a8df61f5dbec72527a72383c92e03756adfaf7f60b8ec347b514d53b571b26bdaeb63f5 SHA512 053d702146225c24421d8d83466121996997917a7bd2dd462304ad6fbe488b6fd03a609712dd46e9bd8a4ec803702323ae0e3fc508b84a71757bfe6966ff7963
-MISC metadata.xml 1154 BLAKE2B 460042ab99add3291902174f2e8623505be246a191cec1792afed2c385ea47c2ba42c5bf3dd01aca0ee9d73c192bff5e501b8f7c46652e2378ae4f1574750f27 SHA512 3048a14a5414888be83baade4f1961161cd07097aa9574cd60225d54001d35df4bac8855c10ca529595baa82fd6137b310f64aff79af3057495b16fcd6cfd558
+EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
+MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 7f6f95dd5c36..50806deadb0c 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/gerbera/gerbera"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
 
 DEPEND="
 	!!net-misc/mediatomb
@@ -33,6 +33,7 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
 	ffmpeg? (
 		libav? ( >=media-video/libav-10:0= )
 		!libav? ( >=media-video/ffmpeg-2.2:0= )
@@ -58,9 +59,9 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_CURL="$(usex curl)" \
-		-DWITH_LOGGING=1 \
-		-DWITH_DEBUG_LOGGING="$(usex debug)" \
+		-DWITH_DEBUG="$(usex debug)" \
 		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
 		-DWITH_AVCODEC="$(usex ffmpeg)" \
 		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
 		-DWITH_JS="$(usex javascript)" \
diff --git a/net-misc/gerbera/metadata.xml b/net-misc/gerbera/metadata.xml
index 1c5747db8ebf..22d6ba3fd3c0 100644
--- a/net-misc/gerbera/metadata.xml
+++ b/net-misc/gerbera/metadata.xml
@@ -7,15 +7,16 @@
   </maintainer>
   <longdescription>Gerbera is a UPnP media server which allows you to stream your digital media through your home network and consume it on a variety of UPnP compatible devices.</longdescription>
   <use>
-    <flag name="curl">Support YouTube and external media sources (e.g. internet radio)</flag>
+    <flag name="curl">Support HTTP media sources (e.g. internet radio)</flag>
+    <flag name="exiv2">Use <pkg>media-gfx/exiv2</pkg> to extract EXIF information</flag>
     <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
     <flag name="lastfm">Enable last.fm support</flag>
     <flag name="magic">Use libmagic to determine file types</flag>
     <flag name="mysql">Use <pkg>dev-db/mysql</pkg> as backend rather than SQLite3</flag>
     <flag name="protocol-extensions">Enable partial DLNA support</flag>
-    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata rather than id3lib</flag>
+    <flag name="taglib">Use <pkg>media-libs/taglib</pkg> for reading files' metadata</flag>
   </use>
   <upstream>
-    <remote-id type="github">v00d00/gerbera</remote-id>
+    <remote-id type="github">gerbera/gerbera</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index dcc9651828bf..02fb3facd47a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -11,5 +11,5 @@ EBUILD iperf-2.0.10.ebuild 701 BLAKE2B 6ae19ec54c963ebe5609c22370a80662e13db46e7
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
 EBUILD iperf-3.4.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
-EBUILD iperf-3.5.ebuild 913 BLAKE2B 5d5b1ef155bf1c151151c29c9ba50cd22ed4b93e06cbbe80363dedbee5c2a285af6e3c1285f57d605db95c3d6efa0f15d504e1218d0a9a8269eabb175b03cfcf SHA512 94835496e5f04604516a2671cbc0e2cc986074db45ded727109afc75c4489abde68d7a7a63566c0cc2d98bc2c94f9b4b6dd058f1a9ca39197c98c25488b94e51
+EBUILD iperf-3.5.ebuild 924 BLAKE2B 8c75107d844f00d4ddd50c4bff0c85748db724b54e0ffd273f6faf4f509b733a7ca014390ca0755f7ef65c1a3ddfb62f1681629bc7e20722feb892bbf4359d36 SHA512 ec4a8c4d8d77a3e0343e87cd430a53169a5892c729effb88ad2f4acf8bfa1a66cb65dd1aec8970a4c7b89c911f48563e297e094acedad045b061150123e81feb
 MISC metadata.xml 406 BLAKE2B a76547cb9d2885900ccabe6c2549039abba6b7a4a0febd58038a088957817634e7340393f0f5c0b4cb655bf54f4ecb33232040aacd0bca3070d6ea48146f70ec SHA512 98d8685483b308d70c56e436291e0229f53982bb78a953b13455eeddaba53ec4ad1d860fc1be4b9340cb89a06471d1caee938bc6213355179147923e0d7eaa17
diff --git a/net-misc/iperf/iperf-3.5.ebuild b/net-misc/iperf/iperf-3.5.ebuild
index 5943f9805db6..3eb759c70f2d 100644
--- a/net-misc/iperf/iperf-3.5.ebuild
+++ b/net-misc/iperf/iperf-3.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="sctp static-libs"
 
 DEPEND="sctp? ( net-misc/lksctp-tools )"
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index acd770ec0182..5128bbee94fb 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -10,5 +10,5 @@ EBUILD ndisc6-0.9.9-r2.ebuild 667 BLAKE2B ef911a647c757ae40bcb64a646d6b041a57261
 EBUILD ndisc6-0.9.9.ebuild 649 BLAKE2B 62a5146d43c94e87ca0c38bfdcb03e11b451b7468b370495c14f852176e7a8e286c5f1bcdb6bb665d7247161489a5fb9869d3e1255d02456eb76e50cbb7937b4 SHA512 3346e9d0f757fcff94c44ba4569dd29d334eb846d727595aec905add6e2ca11d35f43da4e4b9951894fd8f95688f0543663f489f73f8d76f1527c833bb057ded
 EBUILD ndisc6-1.0.2-r1.ebuild 735 BLAKE2B 5a264a8254d70b53d11c3aa86058fa97462dced7c05495d03db24c48b968d16b9b796f2fe8a21e7dfe0cc2530b4163d0d4c201a423af4f6cc676731d38df7063 SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5
 EBUILD ndisc6-1.0.2.ebuild 667 BLAKE2B d020743bf8cb4296c2f5c49c6eddff6c8ed7055d6b769ef1ae07121805689721dda449439105a9d36158a0902443aff19b3dc424190a27be12502f37a3831d97 SHA512 a3be14a15b6b4cc4ee13f506fc8e7acfc4a60eb5a51f0f9998994a866d9788496176f42efbe409e225ab90ba1b98065764640f3d45e44c89d5256a23825d5423
-EBUILD ndisc6-1.0.3.ebuild 735 BLAKE2B 5a264a8254d70b53d11c3aa86058fa97462dced7c05495d03db24c48b968d16b9b796f2fe8a21e7dfe0cc2530b4163d0d4c201a423af4f6cc676731d38df7063 SHA512 1511b39b23aed938f4ba939a6a0152e47960c8abb9202752734f70a1d72c58230c4a1f7adc10ef86cf3b6ef287e9f65d5115cf22482231a846a205024c1799e5
+EBUILD ndisc6-1.0.3.ebuild 746 BLAKE2B 38578126d1afed547f883fc872300545f9f3a84d9571e26ca153031e7237549dda78141a056f9ce58e1dd99dc57a06f4d63d6e4b3e309b5871c12a8be81943b8 SHA512 2fc5d63ee9a56a56b0b69f48e5a42ab13393397be9426f36347f2de6ca9a5c1c54fc6ec4a7525dec564c4d15e6216c88cc67f7419c1d2b751a41a3472cbc80b9
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index 1b789b871e42..c4e9e39d3a7f 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 0c92c1c5810d..5e800687a6fd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -11,5 +11,5 @@ DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef9
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
 EBUILD openvswitch-2.7.2-r1.ebuild 4432 BLAKE2B 1013c7650e66c49ebf697f5d9626b7dc78abe0d12c998b4d7996971ad80b04e10cf77ba41d065dcdc7705148b766471f11303d824e381d2a61cc8a562d803496 SHA512 0a635ac3e3838c451fb9772ea19d8eeb04a5ba108532fcd4759c8333a5628364dd3f702a5ccd777b851fe288b1306a151892b5db0ee74e3d163e86134fa7e73a
 EBUILD openvswitch-2.7.2.ebuild 4379 BLAKE2B 659d30e5bbed8f81b35428720f10cd9c08490080589d3f16a48f526a31e0576236b9d06f622faba8b331dba3ee5e65cca45d234bd52c84afea6ff4916d25b973 SHA512 0e4a4d7a2e636cb485407697d74fc2c1032faef99206d61a0466c4387d1726077f092d67ca1e2f8333132f5ba5ced80d32bc1e2a6308d06297d3e593706107fe
-EBUILD openvswitch-2.8.1.ebuild 4438 BLAKE2B e0706397a4d9edaa9f3c06adf27603e86c5feb337484a6ab23163317eecf285a7ab7614bb730e62e183f4361533ea49e98bd72ba655565c8b811cf7b11a9557d SHA512 fd5ab9f9fc719ab7ff61bd67b02b3a85b80377e9dab260b5cb2ff260f0889bb755599d14c13859068ba19aff077563331ec6f7bbb95dea55e6b3820babb6db5c
+EBUILD openvswitch-2.8.1.ebuild 4437 BLAKE2B 38cc815545bc7e1e02056b60462822947fbffd1b6021b768349ffcffcfd4b9082616d2ecd61b7a9c0d9fca5370e8109c40cd3f84111e2301d48746445e659aa2 SHA512 7ac21f50d16cabe2e6a18093786af5ef773450a3462a3c843c31bec62a7dc480b8a902a718d6400efd933899174788c552a5a02b7a8c145e8cd638d0823c8cfe
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
index f118e96631a6..e5269337cd7e 100644
--- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index c0864f302af1..e7d111636232 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,4 +1,6 @@
 DIST rclone-1.39.tar.gz 38015559 BLAKE2B 534bd0be87e7c8291bfe3acdaff12e9acfddeb42f08067d413184a688b5c0cdfcde78abff3551d81cd2e692a020386116f03842c8390852b2137c2f8342e43f2 SHA512 6e5e5f5e06510f36185d165986cbd3ed994d3cbf97055b4dea37c78af932f89ab8c89249006b829aad38ba43c77ff46f254ba56bcfbae7deca1ebcea555ad884
+DIST rclone-1.40.tar.gz 46067393 BLAKE2B 56bc172965f7f601c8f5c9c72a03ca44b1b41cf280497f7473d318b6667f00df4dac2d104f6fe7daf1529ebedd4d6f4ca5899944e82d68b8fd1b66226264e82f SHA512 ce46393097122f2ae9669310767487218f74ee8fab607cb6355df33329325fe626d17b36565b7864e6b4ca1de75714e29356d7abeb3cc42038d3ab0677408973
 EBUILD rclone-1.39.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
+EBUILD rclone-1.40.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 EBUILD rclone-9999.ebuild 860 BLAKE2B 353b567052ba7037ef3e5e0087b239a9a1849fc34d25349497083e0eb85bebc16092a27d1efbbd8d0c5b4d21b3ca3a6d7641b7612a5437a430c00f022fa74931 SHA512 2996694034cfb94dcb606a927b41d49e6e21bac5f6f6df1d87d704230dd352df2db12c1e11aa792fafba26776801372d18c7a0da1240482a8a5310f18ce14163
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.40.ebuild b/net-misc/rclone/rclone-1.40.ebuild
new file mode 100644
index 000000000000..2c530609ee7b
--- /dev/null
+++ b/net-misc/rclone/rclone-1.40.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 7fa9d36eddc8..4060b63eb3bc 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index cab29d512e84..fcc88a42f8f9 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -7,6 +7,6 @@ DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e069434
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
 EBUILD bitcoin-qt-0.15.1.ebuild 7197 BLAKE2B 1aa41f45e03b1c567fda197271007a17f07c3600e6759a4a9dfa0be918ff6878d8b81582647316efbe15d386e6499ebdd54b161ce8afe97c81e10a4ea92ef757 SHA512 7d452b1526df5815d309987beaee84086d4091c198b0e31bc2c80f6a6baeab5a99aff4b4b366d3c06829c070f87683bcabbfb6c14a22d7f551c0b53cd8b5bc5d
-EBUILD bitcoin-qt-0.16.0-r1.ebuild 5135 BLAKE2B 45dc5202f799c7eadc4a92c0e2a5350e79087def0dd5b23e6070aba4d36b04a759c505b25bdf9223320c7440190e07498efa27d03a4996649c9e0d1fd293d4e6 SHA512 18c33d66fec5ba1fc89922e2b5b6a99e8b0ade48e3f6c5c10f41376a2ed484d972059d3bf94ee838541afb57c422da7d05dc7e7089c7fafd8356ba7e6be1d254
-EBUILD bitcoin-qt-0.16.0.ebuild 4987 BLAKE2B 356bc3619bcf546e37fdd2e12287455b9eb84fb1198413e13ecb72a02db25a739e8938acb4b4df6f79c07f3d507bfe96319fa0cb01278ef92564754b5885f59a SHA512 009ffb28925b791b6b330ab9c4d8bef8c2bbbc3c1453b12b1b1fe15c5c87235d9f8147d65741395861aea40d37d1959f9cf6a3561d6544ea0a6325932d7e5a27
+EBUILD bitcoin-qt-0.16.0-r1.ebuild 5129 BLAKE2B ae3cd021a23c102220de9c15ccdb3c3ce5e85f03eda49d86a3337dcaafe579425994cb77c95879bed87275f7a3dcb4693cc7f934797180e19ec5ac121f4996de SHA512 f2397332f1016324bb384a26ead566ed55bee5a70eda42364ac1d7a3fa16710fd45860f88bd00d0800b8f7e414219ff0d19d824ed7fd85b921ce8f976256e3fe
+EBUILD bitcoin-qt-0.16.0.ebuild 4981 BLAKE2B ce92f5dae608a10c9405108088a39891fb62ce4fe47c663799fc54d1a591d4cfb97d6f2fc755a071308e7b0e375876917a6490cfd6d5bbc8d8fd63b4213454d9 SHA512 11398148eae722375b427abad3244a55ad06b302757fc8823167190171a0e2217f034df5a0bf1b65fecf8f16afd325a95536e63eed28b9182075165504e4e4fc
 MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
index 1e526ce5babf..f3fc18a6875b 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
index a0987233c6ff..4e08a581606c 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq"
 
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index de8620a15799..2ce3fdda4b07 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,9 +1,11 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.4.1.tar.gz 1678548 BLAKE2B 86ff1dce5abf735982f1272f6a97a18bb06d57d0f8008050ae5531323158e629325292c0cd8ba1ef1f1fb9a5d8a79848ea19cb7ab42b1baab40b12d4fd27f921 SHA512 38f8f62de08cc9fbcaa187f4abac2238a3aa0011c6d4bede67b48bc78add32e78bd0e3edb422795246573ece17397a32067d2f20dbc64f020b23f5a86c767021
 DIST cpuminer-opt-3.8.5.tar.gz 1701640 BLAKE2B b42d52da56e141bac42b4e5159325f8344434ecfee6e740fbd3c10cc64b448c6b849b029ea703e0f63e6720625fedcfd84e22dd34fc4a4ce37a88e120337ac1e SHA512 27047b8ee4c2a84f40f62ee6a0a4b24245096ade061d55c3c5374aa12e548aeb6d2dc665799ac81edaabcce63a21af11cef8df6ad050fb8cc7094170ec7a8384
+DIST cpuminer-opt-3.8.6.1.tar.gz 1701432 BLAKE2B daef8f5f4d5734e80fba1f21dbf3954ccb521dd102dc50427f934b6dbb66d74db85cc2f778da47723783fb2ccca81c6e318da414bc1aa968f4e9966faf88ccea SHA512 a88a0f9b0eb62b5ab74e97616c9c90220847fef232987409ec1ac6d47e1b85f0de186cbccdb317db001dec2f67cd6ea7d5c738abc6bbb42fbadbca53492441db
 DIST cpuminer-opt-3.8.6.tar.gz 1701535 BLAKE2B ed51168879e6ca6ada67f13b7325b36c8e58dd3d6d71c55993e84ff9363864fd503f70849fd29366607e57b23f1493539e0e17d1043295266ed4505fbd032cb7 SHA512 57ab3ff3f0a298a4c24d0d8cf4f145627435bbdc4577952995a8babbd7838ae36e56a0d1e2b4c8900af6beecae95af29fef58b74b9afb5268307b67043ef93c4
 EBUILD cpuminer-opt-3.8.4.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.5.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
+EBUILD cpuminer-opt-3.8.6.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.6.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-9999.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.1.ebuild
new file mode 100644
index 000000000000..a1f4a660f6b9
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	curl? ( >=net-misc/curl-7.15[ssl] )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto $(use_with curl)
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 5a05ea913fe7..dad0c40d9a08 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -1,4 +1,5 @@
 AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524ced84d3ae90082571148c563c4cdedf3085b246f8a8b5babc56c7cf742ea48f1f68165c443373f57efcd2139 SHA512 04ea288a2b51480db5ebde3926d453006aad1b8b028e6e60663ba8a11ad876ce2c4070a20715645187dd7e90898d2e865a286df170c82930622042ea14798359
+AUX xmr-stak-2.4.2-fix-paths.patch 2751 BLAKE2B 80aba77f8a34a0a6b198eef222013002193e167c5c76d83c62aedb29fcce8f2441d33d5d9095ec7163866cc4df5b0efc9f1127ae1db1552b26a2f561c811b3ad SHA512 ac8cc0559bbdd7c46dac3382179c1a76f597105675de39bd8024ad01026f598ff7ed7efeca3e82631c6aed0dbe1dff1d2c1b4939e2788f587ab78cdd8554c0cc
 AUX xmr-stak.service 915 BLAKE2B b2dd73404538be09624ebd71f4b45f946ad1fad7a8be9b91a448b9c88ea7499d7deb8595fef32072334fc2b4ebccf90093254fa04eda1afa85c69ba02f7ac86d SHA512 a10b4ca777339bc640d03462d317480083ee4a65617260473e4e65773ca3d4c4db472da3a32b6b1b301dccd8168d624df01ddc45e698419906611ac27015e126
 DIST xmr-stak-2.2.0.tar.gz 316309 BLAKE2B 8a5042e91eff1d7a49dcf50d67430f21459509443117150f59f861edb0c145e0f336cb617ea4f2a7edfd923493efbc8f5ce9cd134a7f7af14b270c8cfdd3cc24 SHA512 1ec30b1f97043307461816e61cb7afaf9e77cfad895b13f5facf98f34da8d9b8751d9885930b0a38777017978fb4f25bb3a69a1c2a5db47b1a851bc88cd7d78d
 DIST xmr-stak-2.3.0.tar.gz 333364 BLAKE2B f8824f545ea08267eb9f670f2aaba7cb2e98693e5603dee5fbe54bb3f3ebc21509f26bb0d10239b79675e3ce32a2f4b32b591fb3af51b4c716fbb84beeb7326e SHA512 2828789ac63ab3cb13e36c6f86d9cf82f21f15f51df873a8a3e42757d16357653823d28103f2a076afa67ce7ca277ec92c5aee25fc823806e85c3a8c80b4ae5d
@@ -7,6 +8,7 @@ DIST xmr-stak-2.4.2.tar.gz 334041 BLAKE2B 7d37ffd2e3d5f8a25692fe2ebdc8a75242fb02
 EBUILD xmr-stak-2.2.0.ebuild 1754 BLAKE2B fc921b9830ae5b06239be726cea03b03857c131341febfc28ba1eacd69bdc274ec10522da0d3921ed6c993a5be56177deaa4ebe95d422af878f7f8c47a888295 SHA512 5543e31a61d53b7c8e8dd42d23814eda07d672803dd66d1eaec9a1aa822a31f1044750aacf61366782b644eec4f5fdad5de4cacbc5248a737666b02598012f61
 EBUILD xmr-stak-2.3.0.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 EBUILD xmr-stak-2.4.1.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
+EBUILD xmr-stak-2.4.2-r1.ebuild 1886 BLAKE2B 551770a4783297d2b6a13101a280b591b5823eb81decab94754cd27fec91c29c9c67f1180bc1f957c092b6690be13065a4f35db97e2ab5e37e56f1fe597b2ef9 SHA512 7ae6ef7168282a09273ec03932c48fa030c5e2e5b2d36476c9638b65e803ca98397cfa6b27ce2454d047eaa7a04d86468a1073bb766b9f900169da99f3d12765
 EBUILD xmr-stak-2.4.2.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 EBUILD xmr-stak-9999.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
new file mode 100644
index 000000000000..cd71554b3770
--- /dev/null
+++ b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
@@ -0,0 +1,68 @@
+From 3bbf91be9f510ef999c62ae2d42a094d271299b7 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 6 Apr 2018 14:56:44 -0400
+Subject: [PATCH 1/2] Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
+
+Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH to control the path to which the executable and libraries are installed.
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15a2684c..66c2f6f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -535,23 +535,23 @@ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
+ # do not install the binary if the project and install are equal
+ if( NOT CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR )
+     install(TARGETS xmr-stak
+-            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_OUTPUT_PATH}")
+     if(CUDA_FOUND)
+         if(WIN32)
+             install(TARGETS xmrstak_cuda_backend
+-                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         else()
+             install(TARGETS xmrstak_cuda_backend
+-                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         endif()
+     endif()
+     if(OpenCL_FOUND)
+         if(WIN32)
+             install(TARGETS xmrstak_opencl_backend
+-                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         else()
+             install(TARGETS xmrstak_opencl_backend
+-                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         endif()
+     endif()
+ else()
+
+From c1d907ee03795fdce80daba6395e2a7eb1333930 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 6 Apr 2018 15:11:07 -0400
+Subject: [PATCH 2/2] Allow EXECUTABLE and LIBRARY paths to be set
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66c2f6f8..1ff7fbb4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -522,8 +522,8 @@ else()
+     add_executable(xmr-stak ${SRCFILES_CPP})
+ endif()
+ 
+-set(EXECUTABLE_OUTPUT_PATH "bin")
+-set(LIBRARY_OUTPUT_PATH "bin")
++set(EXECUTABLE_OUTPUT_PATH "bin" CACHE STRING "Path to place executables")
++set(LIBRARY_OUTPUT_PATH "bin" CACHE STRING "Path to place libraries")
+ 
+ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
+ 
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..046820ffa943
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-fix-paths.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
+		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
+	fi
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index a5af823c96d6..03d4fe99b9ec 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 5e4614131ef0..968baf521702 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,6 @@
 DIST chirp-daily-20170714.tar.gz 701208 BLAKE2B 2b73f605c86f9a7650f3dee05d2735d26583221206a824f1a0f0642a41ecbbc6e94e1b2b069c40cbb7a5d73d1219c719c896f75cc647f668eeded627af3bc279 SHA512 4ebc09142077fe2e17f4d01ce83babd07a55eb44db4f62358c1eaa341ffc983f7bacffa734caf1ec6973037571878bdb6d7b65fe6905681a1aa62ac0dee2a09c
+DIST chirp-daily-20180331.tar.gz 754495 BLAKE2B 81db154e784b0d01809e79b3eee6c518becb3760f85b606ab7bae174d77fdc5fee9fa81684cb1784e80f27abb909a1825519ea6e72fb2d69e9e4aa788deb3c53 SHA512 2ddcf8bcf5ff47639c06e5dce212e747fe7bc0bf3347da226a0d26c27748cbcc99726d6926c695d742d101376581e708a601129bac75687c5e92bc8a55863f3d
 EBUILD chirp-20170714.ebuild 1043 BLAKE2B 003a08c8574795d9bf453bef24bde2a6cec0d0c48ca3e412ba8feef0e54a10c11aee4ee226daff65eb7c0b9f1bd8719f4226e3d20a92f3d635a98f2a218718f3 SHA512 5db611b3be52f84db7f6821c9e321abdb2bf055dd015a2a677f0292bb06c08e8612cd7b9bd5e4a37299fc59b5df23e67e897560e2d5b0cfe286b3c5c38e1d630
+EBUILD chirp-20180331.ebuild 1043 BLAKE2B af0785d96477689c3be5b933220c2ee16f1fc4d0ad3c021c53926a899c576117e46a6ba2ce3ec90697694f69e38e6d22fbbeb20cf6b85e1d9e3c2ff2265cd679 SHA512 eeb9bc29822fb4e7b7942e7181a05c84b2b0cb2523a3b8e6c965a098394ce1fc7ed1a92700e9698bbf6bc95ae8b1d8181cba43a4a3e3b926b7d023fbffe1ece6
 EBUILD chirp-99999999.ebuild 1043 BLAKE2B 003a08c8574795d9bf453bef24bde2a6cec0d0c48ca3e412ba8feef0e54a10c11aee4ee226daff65eb7c0b9f1bd8719f4226e3d20a92f3d635a98f2a218718f3 SHA512 5db611b3be52f84db7f6821c9e321abdb2bf055dd015a2a677f0292bb06c08e8612cd7b9bd5e4a37299fc59b5df23e67e897560e2d5b0cfe286b3c5c38e1d630
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20180331.ebuild b/net-wireless/chirp/chirp-20180331.ebuild
new file mode 100644
index 000000000000..556485ceac99
--- /dev/null
+++ b/net-wireless/chirp/chirp-20180331.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+if [[ ${PV} == "99999999" ]] ; then
+	SCM=mercurial
+	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
+fi
+
+inherit distutils-r1 ${SCM}
+
+DESCRIPTION="Free open-source tool for programming your amateur radio"
+HOMEPAGE="http://chirp.danplanet.com"
+
+if [[ ${PV} == "99999999" ]] ; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-daily-${PV}"
+	RESTRICT="test"
+fi
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="radioreference"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python]"
+RDEPEND="${DEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	sed -i -e "/share\/doc\/chirp/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pushd tests > /dev/null
+	"${PYTHON}" run_tests || die
+	popd > /dev/null
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ba9788975d36..56aa14ba15e3 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/default/bsd/fbsd/package.use.mask b/profiles/default/bsd/fbsd/package.use.mask
index 847178b8aacd..28e9c5cc1266 100644
--- a/profiles/default/bsd/fbsd/package.use.mask
+++ b/profiles/default/bsd/fbsd/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (06 Apr 2018)
+# We are building only minimal util-linux, so program flags
+# are irrelevant to us.
+sys-apps/util-linux build cramfs fdformat kill ncurses pam readline
+sys-apps/util-linux slang suid tty-helpers
+
 # Brian Evans <grknight@gentoo.org> (2 Mar 2018)
 # php incorrectly looks for libacl when it is built-in on FreeBSD
 dev-lang/php acl
diff --git a/profiles/package.mask b/profiles/package.mask
index f0483b076c78..b479c4006e24 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (06 Apr 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days. Bugs #644478
+x11-libs/libqxt
+
+# Andreas Sturmlechner <asturm@gentoo.org> (06 Apr 2018)
+# Dead upstream, dead homepage, depends on dead Qt4.
+# Masked for removal in 30 days. Bugs #642448, #636472
+media-video/bdsup2sub++
+
 # Rick Farina <zerochaos@gentoo.org> (04 Apr 2018)
 # Violates PMS and does not work with stable portage.
 # Masked for removal in 60 days, lift mask if bug #650126 is fixed
@@ -67,6 +77,11 @@ dev-lang/idb
 <sci-libs/ipp-18
 sci-chemistry/cyana
 
+# Jeroen Roovers <jer@gentoo.org> (6 Apr 2018)
+# Requires >=dev-libs/icu-61.1
+# https://bugs.gentoo.org/651698
+=net-libs/nodejs-9.11*
+
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (3 Apr 2018)
 # Merged into >=dev-db/m17n-db-1.7.0.
 # Masked for removal in 30 days.
@@ -581,16 +596,6 @@ dev-lisp/asdf-binary-locations
 # Masked for removal in 30 days. Bug #648448
 dev-lisp/gentoo-init
 
-# Michael Palimaka <kensington@gentoo.org> (07 Mar 2018)
-# Depends on deprecated Qt 4. Dead upstream.
-# Masked for removal in 30 days. Bug #649116.
-media-video/qt-recordmydesktop
-
-# Michael Palimaka <kensington@gentoo.org> (07 Mar 2018)
-# Depends on deprecated Qt 4. Dead upstream.
-# Masked for removal in 30 days. Bug #644424.
-media-gfx/qosmic
-
 # Brian Evans <grknight@gentoo.org> (06 Mar 2018)
 # MariaDB MaxScale 1.x depends on the deprecated libmysqld
 # Newer versions bundle software that require git access
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6fb043e53531..c0a4f0949e90 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2130,6 +2130,7 @@ dev-libs/libgit2:ssh - Enable SSH transport support
 dev-libs/libgit2:trace - Enable tracing support
 dev-libs/libgit2-glib:ssh - Enable SSH transport support
 dev-libs/libgpg-error:common-lisp - Install common-lisp files
+dev-libs/libgpiod:tools - Build some useful gpio tools that use libgpiod.
 dev-libs/libgpuarray:cuda - Enable NVIDIA CUDA toolkit support
 dev-libs/libgpuarray:opencl - Enable OpenCL support
 dev-libs/libgweather:glade - Installs catalog files for dev-util/glade
@@ -6366,13 +6367,14 @@ net-misc/felix:bird - Use BIRD, e.g. for route reflection
 net-misc/freerdp:client - Build client binaries
 net-misc/freerdp:openh264 - Enable H.264 support using media-libs/openh264
 net-misc/freerdp:server - Build server binaries
-net-misc/gerbera:curl - Support YouTube and external media sources (e.g. internet radio)
+net-misc/gerbera:curl - Support HTTP media sources (e.g. internet radio)
+net-misc/gerbera:exiv2 - Use media-gfx/exiv2 to extract EXIF information
 net-misc/gerbera:ffmpegthumbnailer - Enable video thumbnail support with media-video/ffmpegthumbnailer
 net-misc/gerbera:lastfm - Enable last.fm support
 net-misc/gerbera:magic - Use libmagic to determine file types
 net-misc/gerbera:mysql - Use dev-db/mysql as backend rather than SQLite3
 net-misc/gerbera:protocol-extensions - Enable partial DLNA support
-net-misc/gerbera:taglib - Use media-libs/taglib for reading files' metadata rather than id3lib
+net-misc/gerbera:taglib - Use media-libs/taglib for reading files' metadata
 net-misc/gnome-online-miners:flickr - Enable Flickr support
 net-misc/gsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
 net-misc/gsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 4d9196ed0fc2..0b3ced267d43 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/common_tutorials/Manifest b/ros-meta/common_tutorials/Manifest
index 92a160362a33..573012659e1f 100644
--- a/ros-meta/common_tutorials/Manifest
+++ b/ros-meta/common_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST common_tutorials-0.1.10.tar.gz 12511 BLAKE2B deeb06317c0f56f2496277f488592ba056b82440cb320fc9ea6bd3d2d6b8828301ce03c2f5db9ed1871b4f6a1caa8c874a510c912ab89ef1d05b01f364ee09be SHA512 92a1eb5865ec3b4acc9e04a507f050d9568e583ce6d0a29f3c6ab37f4c2feb5149f1ddd6269ce1a310251f7b4cbfe8a05c7e4c6bf4c3ca21c15d84f1c6f0422b
+DIST common_tutorials-0.1.11.tar.gz 12527 BLAKE2B 679cee86aad711677d1ed74320832c7ceb6d66adb34b835a80ad536be7bff517a78ca43e04372de23b491f8156ea3a4c268b4661d74fb1c04130e39033e1b961 SHA512 a42ab4b95eeaf9620ae0987f4e1cc530213b39455dea3ff8d944ac24ee7ed8e321ac8ed4f73b8e4d8d882248a850dface0169a5d521b02b226e6d0cb6016a33a
 DIST common_tutorials-0.1.8.tar.gz 10591 BLAKE2B 7bf99e6a46ff52904f34f0b8e226dab10634325531ac736e530499af43ad1f1ca62168e476ef6ea9e33007c883804220b512e7683fed36e6940017624031f0ac SHA512 a0a2e8a7aba3415bf133e95e7d1b72cf5ee81efa962003ccaa2108fdfebd2a03044c60fd4daf73ca69f3a2975bd7fa9c60adfefc32d1b048da11e65aa613607c
 EBUILD common_tutorials-0.1.10.ebuild 462 BLAKE2B 6c61574bf14b8d06905fa3d7b6962f00e2c91ff153008a46b00b22ce32cd8d9361a79e653f5b2569629b68528f52e1ef3ae4f46626f5a0f6f1b39649ab8d0a6d SHA512 9acd83437282fd3997ba76b29d702f143032885ff79867d7282c3b4704787fca61fa0d3570c3c8f329fdbed61a02ea3f655096d3228e0c0e0394c319169bf74b
+EBUILD common_tutorials-0.1.11.ebuild 462 BLAKE2B 6f04fcc0aeddea127e6728a915d78c2378cbc713ca3362984e6390a993a7cb033aa8c355eabbb19658872bd3f244fd087ff1d9b1c1de7b30e4c3b58a73f8558b SHA512 ba4baa4c593d360e30f567e6a0f161abf937d03ce24f2a1ccc025b4fe4b916e5e0ce77b89f35b7bea7b8d703ffac3b1cba293919e35879a4cb7c79151b7b9680
 EBUILD common_tutorials-0.1.8.ebuild 462 BLAKE2B 3c8d79dda3437c685b4f248c8dee082884784f5a697736d9a1d2bf612ece2830a11ae12372415078f3c4bc7c7d80526744951c90890da1048aa153ae2201ec3e SHA512 d436e4bacc9aa32ab033a283e1a8775ce1f7be0d29a7bfba29c806c659276c3549e20990131064a1aa16cbf26c0d4ebb4db9254ad36d77900737c93e93350295
 EBUILD common_tutorials-9999.ebuild 462 BLAKE2B 3c8d79dda3437c685b4f248c8dee082884784f5a697736d9a1d2bf612ece2830a11ae12372415078f3c4bc7c7d80526744951c90890da1048aa153ae2201ec3e SHA512 d436e4bacc9aa32ab033a283e1a8775ce1f7be0d29a7bfba29c806c659276c3549e20990131064a1aa16cbf26c0d4ebb4db9254ad36d77900737c93e93350295
 MISC metadata.xml 334 BLAKE2B 9448c76327ed1df85e94f230f66b62356f9f3f6e0ae2853cba879c3357bf19ba534098914207e4bca6e21b3a1e33a5a911084a5f83b9d9b1bdba8282bf70b6e5 SHA512 dcec72972fcaf9c06c0fcc8ed3825875667e3391de433ace73961159cede1a33c40f7dfca78ca22e018e730024af73562786f90fcc1f2ccf39ab11106f37d038
diff --git a/ros-meta/common_tutorials/common_tutorials-0.1.11.ebuild b/ros-meta/common_tutorials/common_tutorials-0.1.11.ebuild
new file mode 100644
index 000000000000..ba12d700282c
--- /dev/null
+++ b/ros-meta/common_tutorials/common_tutorials-0.1.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/common_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage that contains common tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib_tutorials
+	dev-ros/nodelet_tutorial_math
+	dev-ros/pluginlib_tutorials
+	dev-ros/turtle_actionlib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/Manifest b/ros-meta/desktop/Manifest
index 7c3aec7b065f..a378e0043694 100644
--- a/ros-meta/desktop/Manifest
+++ b/ros-meta/desktop/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD desktop-1.2.0.ebuild 506 BLAKE2B 5286e84fc69ef188fd9183e51f6e280f3609cfdd6c88914b7022895ffa5abe91805c2678590ad65729915b52ec5e76b83aad6b0d8244bfd1a7f0b9960ba97240 SHA512 7f13b4085c489328d514088966bf6172cd63efea43c5ae3cc48a0bf1a262bdde3e12b69acabe0af6750e325429562e262643cff05bf3307240674f805aa09dd1
-EBUILD desktop-1.3.0.ebuild 449 BLAKE2B c8554d264bdfd4c03dc486877ffa0972a01d9bb0a3d35b0c375d9b0d2f52d7ebb6ddfb10fa3d856d45c6bd47774e0ce54f4fdd14fa98a85b532d49ba1c5e0b11 SHA512 24bca18b22afd1bc4e436dd582d25f9a8f063959252706b53fe8e303bfd1b06bf75aaf01fff2cae2f895932e24c74322ff8dffeefe0a73d6e68598940ff63e85
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD desktop-1.3.1.ebuild 426 BLAKE2B 62f0f275406b690b02893c52f8fdae0a240b55b5957de525b1acb5279ecb9103cbc807eaffb4793fd7199e530b5854ef6c239f6b8e5b5d31366292b850a5ee8e SHA512 e5b59aab7626053c2171bcf5b68953ede65661a055a4ab1a9da3026166febb6ca1f417108835d963adc4a1743fc417497da0b3f0430cbc87f3c36c8143fc47aa
-EBUILD desktop-9999.ebuild 426 BLAKE2B 62f0f275406b690b02893c52f8fdae0a240b55b5957de525b1acb5279ecb9103cbc807eaffb4793fd7199e530b5854ef6c239f6b8e5b5d31366292b850a5ee8e SHA512 e5b59aab7626053c2171bcf5b68953ede65661a055a4ab1a9da3026166febb6ca1f417108835d963adc4a1743fc417497da0b3f0430cbc87f3c36c8143fc47aa
+EBUILD desktop-1.3.2.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
+EBUILD desktop-9999.ebuild 545 BLAKE2B 80bdf50ff305641fb13a4f79eb3772b777aa8eb93aa34b73ad691605b3f47359887695e2e494b62978653ad9c73d8a2aa68d86c5d903148c5438c4076d52626c SHA512 85f8dc98250b2c87174b49dc8c60051ea5ce1344841b432ecfb3fd13c796022c8bce4325ee74416af3f90235cf2a2956d1cf8baca9f557484f043ac64674e33c
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/desktop/desktop-1.3.0.ebuild b/ros-meta/desktop/desktop-1.3.0.ebuild
deleted file mode 100644
index 6ca330e23b94..000000000000
--- a/ros-meta/desktop/desktop-1.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for a basic ROS desktop install"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/robot
-	ros-meta/viz
-	dev-ros/roslint
-	dev-ros/urdf_tutorial
-	ros-meta/visualization_tutorials
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/desktop-1.2.0.ebuild b/ros-meta/desktop/desktop-1.3.2.ebuild
index a7be5d33d287..801a5e18074b 100644
--- a/ros-meta/desktop/desktop-1.2.0.ebuild
+++ b/ros-meta/desktop/desktop-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,9 +17,11 @@ IUSE=""
 RDEPEND="
 	ros-meta/robot
 	ros-meta/viz
+	dev-ros/angles
+	ros-meta/common_tutorials
+	ros-meta/geometry_tutorials
+	ros-meta/ros_tutorials
 	dev-ros/roslint
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
 	dev-ros/urdf_tutorial
 	ros-meta/visualization_tutorials
 "
diff --git a/ros-meta/desktop/desktop-9999.ebuild b/ros-meta/desktop/desktop-9999.ebuild
index 57ee10fc02b5..801a5e18074b 100644
--- a/ros-meta/desktop/desktop-9999.ebuild
+++ b/ros-meta/desktop/desktop-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,12 @@ IUSE=""
 RDEPEND="
 	ros-meta/robot
 	ros-meta/viz
+	dev-ros/angles
+	ros-meta/common_tutorials
+	ros-meta/geometry_tutorials
+	ros-meta/ros_tutorials
 	dev-ros/roslint
+	dev-ros/urdf_tutorial
 	ros-meta/visualization_tutorials
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/Manifest b/ros-meta/desktop_full/Manifest
index f21086d5651a..76c55f2e0c11 100644
--- a/ros-meta/desktop_full/Manifest
+++ b/ros-meta/desktop_full/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD desktop_full-1.2.0.ebuild 406 BLAKE2B add15f05339431fd2b7f4367b4e8fc590d89dab73f23b52255b6e5d50ec26c3b450b5b8e90eee2a70799e1935b2c6b8daa48ac05f3224218d5f08d9f834ec246 SHA512 cd255969d597fe8efabd2094b615eec58bf8bfffc19b51f9f4010f19733f8bd921cb934c5e523bf3f314f707ef61ecf63e3a782134be22f20ef8471191770a0a
-EBUILD desktop_full-1.3.0.ebuild 406 BLAKE2B add15f05339431fd2b7f4367b4e8fc590d89dab73f23b52255b6e5d50ec26c3b450b5b8e90eee2a70799e1935b2c6b8daa48ac05f3224218d5f08d9f834ec246 SHA512 cd255969d597fe8efabd2094b615eec58bf8bfffc19b51f9f4010f19733f8bd921cb934c5e523bf3f314f707ef61ecf63e3a782134be22f20ef8471191770a0a
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD desktop_full-1.3.1.ebuild 429 BLAKE2B f94e018c3ddb1606b32961151a7f7d22bc07b1024bcf3104a5569887faa7a0cbf23e4f6d08917e5a1715042c3f3995a5066b7579387c71f6091ce100e2ad597a SHA512 a909d6569232079079266e7167831db796b95dfafa393b89b0332e189fbfde3f16ca0cc35b54464e8a3bfb639dd64d396c384a207371eb27552e83ebf607a6b9
-EBUILD desktop_full-9999.ebuild 429 BLAKE2B f94e018c3ddb1606b32961151a7f7d22bc07b1024bcf3104a5569887faa7a0cbf23e4f6d08917e5a1715042c3f3995a5066b7579387c71f6091ce100e2ad597a SHA512 a909d6569232079079266e7167831db796b95dfafa393b89b0332e189fbfde3f16ca0cc35b54464e8a3bfb639dd64d396c384a207371eb27552e83ebf607a6b9
+EBUILD desktop_full-1.3.2.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
+EBUILD desktop_full-9999.ebuild 429 BLAKE2B fa8abeef13b7e17677e6f7f645adaa5d97d1388e3fc258e4c9893ba15924048b82a219d5c99218b6bfe5be2daad4ebfd155f3a1a47aac5659ba8644a229f98d7 SHA512 99329d95c13cfdd580ecfd238fd887bb2dcc6b98261f0aaeda07f101a764a13892d0b5a1abf80ef9c3641969bc38f3ca70cc3a912a0348e1c033ab2b566110c5
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/desktop_full/desktop_full-1.2.0.ebuild b/ros-meta/desktop_full/desktop_full-1.2.0.ebuild
deleted file mode 100644
index 0958a0238dc7..000000000000
--- a/ros-meta/desktop_full/desktop_full-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS complete desktop install"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/desktop
-	ros-meta/perception
-	ros-meta/simulators
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/desktop_full-1.3.0.ebuild b/ros-meta/desktop_full/desktop_full-1.3.2.ebuild
index 0958a0238dc7..6355747b05a6 100644
--- a/ros-meta/desktop_full/desktop_full-1.3.0.ebuild
+++ b/ros-meta/desktop_full/desktop_full-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,5 +18,6 @@ RDEPEND="
 	ros-meta/desktop
 	ros-meta/perception
 	ros-meta/simulators
+	dev-ros/urdf_tutorial
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/desktop_full-9999.ebuild b/ros-meta/desktop_full/desktop_full-9999.ebuild
index 5d7cc244f8fe..6355747b05a6 100644
--- a/ros-meta/desktop_full/desktop_full-9999.ebuild
+++ b/ros-meta/desktop_full/desktop_full-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/ros-meta/perception/Manifest b/ros-meta/perception/Manifest
index 850842a28abb..2db5662c6a34 100644
--- a/ros-meta/perception/Manifest
+++ b/ros-meta/perception/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD perception-1.2.0.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
-EBUILD perception-1.3.0.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD perception-1.3.1.ebuild 513 BLAKE2B ade319e73a11d3c56ea6e178aa0d3198d89ec78303e84643858c7276034bfaa4ab4a936f5a990501bffd6235d6d043d10fc42db28b652dde60a7f90e6c701a9f SHA512 bef67e78bc39dfd6297d7813bfb46b1f5969d4f57f3ec8c06d9a336e5e2ed1b0e253f710337b7ac0ed4f01f1bf2fe6fbd1a74750d27c29e523e0fa46cad3e2c5
+EBUILD perception-1.3.2.ebuild 513 BLAKE2B 6053fd2384b293bc47f875a209e0d3da510c67c1b39043b880f73ef135b2c0d4d91527d508abcc6ccc8cb33ffdc84a97120438a8a8b2cbc3ada7d4b6126ebb49 SHA512 59199855d0562abf6f0bc5bbd1ebdaa9fd9e6492f57b1283806030634b0f8f71f98b36f8cfa26a5f2298ff80bb92361650c437790df15c977f3a026308b0f818
 EBUILD perception-9999.ebuild 513 BLAKE2B cd224cd32cf4b525298158367d2e993d58b5689c8788b824c3f2f3df1b8e1e302e1c74a6f03f755114b1de00a80e6b1e9962a1d807916c7d499eb9a7bbc667e7 SHA512 a10767d24fcabefa889f5e74cc897fbfef67be4f2ecaaf94e8f286680facc1566973fce7f7292c01c03f3b705ec9994bb82f4570d56dadd07545743be83d7f3f
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/perception/perception-1.3.0.ebuild b/ros-meta/perception/perception-1.3.0.ebuild
deleted file mode 100644
index 79094bdc2634..000000000000
--- a/ros-meta/perception/perception-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS perception stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	ros-meta/image_common
-	ros-meta/image_pipeline
-	ros-meta/image_transport_plugins
-	ros-meta/laser_pipeline
-	ros-meta/perception_pcl
-	ros-meta/vision_opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception/perception-1.2.0.ebuild b/ros-meta/perception/perception-1.3.2.ebuild
index 79094bdc2634..935d09829b90 100644
--- a/ros-meta/perception/perception-1.2.0.ebuild
+++ b/ros-meta/perception/perception-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/ros-meta/perception_pcl/Manifest b/ros-meta/perception_pcl/Manifest
index ff0227a4877e..4746dc3cfc65 100644
--- a/ros-meta/perception_pcl/Manifest
+++ b/ros-meta/perception_pcl/Manifest
@@ -4,11 +4,13 @@ DIST perception_pcl-1.4.1.tar.gz 66440 BLAKE2B 9670227e66b42c36a63de282eb015efe6
 DIST perception_pcl-1.5.1.tar.gz 66945 BLAKE2B a4ba43188386a39e5d73d0b4b67833ce1f6a6c6ce2e3912d743aae755116f2e5f6cc78ca9ea0d11b5e7ab5f07591872eca2df668e746df3dd0f9a79acc4554f4 SHA512 d7fd77e8afeccd45226404c57a267af19b0c98cb61123bdb1b1330fc3833b6bc1a72e775a3eba6a6f8df212af23328894617cf45a4c028278ef408a1d0ef74ce
 DIST perception_pcl-1.5.2.tar.gz 67004 BLAKE2B 6193ca81637df71c6e990d70425cc23b7284a756dc96d341ed5f9fc25d1404747dccc0a24d9de08428d7bec43bb13874619b70f57ef7fe35fbc72aeb0954dc77 SHA512 503f46d71dbf58e985422c6f31c3491189dbd9494bc68221026721dc889a34633be867b20f8b5cc8bec77f500cb4133061be1eb1775afd2a4edcdac13cb629f5
 DIST perception_pcl-1.5.3.tar.gz 67101 BLAKE2B 963d65d348068e574fd0d7431597409d607e779f017b3a645b1add5599baeed559898e5a9873d6b3ead6ea812cfda80b96f9ccfea482801b3c76d17bf234c26b SHA512 e34089f48cfe40f0209a7d4a3a0fb2402c1d1fc35bdf7a57970374bcec50185efcbb1e56b08ee64810a43e83fdf7e45ecddd09ff9660b47399b9f751be80df8b
+DIST perception_pcl-1.5.4.tar.gz 73829 BLAKE2B cfc6e964691da42717d134e0b639ef4af4491074de171a84d081bf66c061a51b7c2da750ff539dd784a7a4c34cfdfe18d7d2e38c4e6d0370fbc441f9b3a6196d SHA512 e9da9b2f9b602b67bceec9b0adf515b500d77c9e5c2dbdc1f63bf5a91419bbf7f9f41d602646b8197dffcf7a077b63eb402a507dbc6bb96405a8f4d64576e36e
 EBUILD perception_pcl-1.3.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.4.0.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.4.1.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 EBUILD perception_pcl-1.5.1.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
 EBUILD perception_pcl-1.5.2.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
 EBUILD perception_pcl-1.5.3.ebuild 381 BLAKE2B 527415132369cf09251a5ea14121c50e2c9e1484d0fecdfb9329dec3ad8738d2f487155716d5ea2ade758346b713597d4a2d4844d97ba5e95411a31efca6afce SHA512 c5a71bad50fb9a8ea8c8488e54e75702399d1cd838006f3553d9e07e916ee1ac28ee6ccfc50608be148b17e724e02c7103142f1f06a5f996212fa7e4d61e1fa5
+EBUILD perception_pcl-1.5.4.ebuild 381 BLAKE2B 3713f9a5fdd6a88a3bf7f6bdfba2d03bae31601fc38812ccba4c7414a8899e059a78211038ecb055b1899c89b0fc2ed056b2d2d9eca3f951227ec998c007c818 SHA512 320691fce86bc1e045d54216fcb7200ed341ce416364f70f2920259675e92d4f8d2cde9879dd2774a93fde24891ea481e257afcd85b43bb0cba14e5f46565809
 EBUILD perception_pcl-9999.ebuild 381 BLAKE2B f6cca2b63dae4491d472fad5dc5dd354da8e36cf458bb51a9d80c09cb1f5e33e15207e72535b66b1924a6d2060ce593d6577acc61d4d66dcffad95ae9179bd67 SHA512 cda3607ca11a9f6731a4852fb9cf126ab87cfe2e819407ea2775321fd9a9dacf4bc01c586bd532b3dbe798cf2852ac33a301d4c043efeb68d103bdd528b41ebc
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild b/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild
new file mode 100644
index 000000000000..48d0c60e3ead
--- /dev/null
+++ b/ros-meta/perception_pcl/perception_pcl-1.5.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="PCL (Point Cloud Library) ROS interface stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/pcl_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/Manifest b/ros-meta/robot/Manifest
index 3acf74590cef..5ccd8bcd3e50 100644
--- a/ros-meta/robot/Manifest
+++ b/ros-meta/robot/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD robot-1.2.0.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
-EBUILD robot-1.3.0.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD robot-1.3.1.ebuild 737 BLAKE2B 90d7f43a1d757dc2cae80da8e58663a8109ab474c7a50e06404a01c79e6ba1c7abf809d712f589cbb25449f31e0cf6d47212ed6ab84b9df4191428e2959df3fd SHA512 7f969c5a1d054576feb2fef93a992b21e177dfa6c04ca0bbf27409d19a23b3f883de645574f806fd5be8fe56e2b14aa837bd5ae8e50a79bcabbcf66872d3de49
-EBUILD robot-9999.ebuild 737 BLAKE2B a9e0738e8b81460cadcbcdf3170aeb56ab8ed30e58e1e2c69ee8edf9f3d1749a241adaf262999acab5a8409f798316517fc0d268b89defb525a13f04c572e9e3 SHA512 18164ab53b49480238aaf9f6cce4ec060825103849711ce2430d2f8472ad1cada0047c8dccd184d618fd25637fe44ae2bee0b105d66a235519e2943edcab3373
+EBUILD robot-1.3.2.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
+EBUILD robot-9999.ebuild 672 BLAKE2B 6803d7b3bfcf08b7b40f2ffa11a1527b6883fafc9da94167a8896885b4731581202187d87ff22cf650f3d1d80470bbc9522789b8b440dff9d22ee5cb7f3bde78 SHA512 2c6fa7342d2c2143ee21dff8d1309bb6f355d9b47a1812339728cad231188129f6057b4acdb6e8a47382a24dbab825307c920cbee604e14aafff7eec23f313ba
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/robot/robot-1.3.0.ebuild b/ros-meta/robot/robot-1.3.0.ebuild
deleted file mode 100644
index a924cceb9df9..000000000000
--- a/ros-meta/robot/robot-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage which extends ros_base and includes ROS libaries for any robot hardware"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	dev-ros/control_msgs
-	ros-meta/diagnostics
-	dev-ros/filters
-	ros-meta/geometry
-	ros-meta/robot_model
-	dev-ros/robot_state_publisher
-	dev-ros/xacro
-	ros-meta/executive_smach
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/robot-1.2.0.ebuild b/ros-meta/robot/robot-1.3.2.ebuild
index a924cceb9df9..3762fd95629e 100644
--- a/ros-meta/robot/robot-1.2.0.ebuild
+++ b/ros-meta/robot/robot-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,18 +18,15 @@ RDEPEND="
 	ros-meta/ros_base
 	dev-ros/control_msgs
 	ros-meta/diagnostics
+	ros-meta/executive_smach
 	dev-ros/filters
 	ros-meta/geometry
-	ros-meta/robot_model
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
 	dev-ros/robot_state_publisher
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
 	dev-ros/xacro
-	ros-meta/executive_smach
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/robot-9999.ebuild b/ros-meta/robot/robot-9999.ebuild
index a924cceb9df9..3762fd95629e 100644
--- a/ros-meta/robot/robot-9999.ebuild
+++ b/ros-meta/robot/robot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,18 +18,15 @@ RDEPEND="
 	ros-meta/ros_base
 	dev-ros/control_msgs
 	ros-meta/diagnostics
+	ros-meta/executive_smach
 	dev-ros/filters
 	ros-meta/geometry
-	ros-meta/robot_model
+	dev-ros/joint_state_publisher
+	dev-ros/kdl_parser
+	dev-ros/kdl_parser_py
 	dev-ros/robot_state_publisher
+	dev-ros/urdf
+	dev-ros/urdf_parser_plugin
 	dev-ros/xacro
-	ros-meta/executive_smach
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/Manifest b/ros-meta/ros_base/Manifest
index 7314c45a8989..96d3cc932b1f 100644
--- a/ros-meta/ros_base/Manifest
+++ b/ros-meta/ros_base/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD ros_base-1.2.0.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
-EBUILD ros_base-1.3.0.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD ros_base-1.3.1.ebuild 536 BLAKE2B 4151952fa349db4aaa72e2ef8ee78be181fcc8aeb54b0c6ab6fe71476d3447562ac96486ae4245b54eff8fa8f3165894e010e8257de7915298c9f725ddf9cd6c SHA512 19a7bead19f66e88ff1bd1b9896c0e358bb30ddab8d1371b13d18c63aed2ab371bea3cf1cb1bd96e4b81aca002661d4fe33fc5270ea598ea0f7df376dab9260a
-EBUILD ros_base-9999.ebuild 536 BLAKE2B b3a7f4b29c00502a396375b97af3daace6e16f4e722d1d987ecf7c374175c9c61d55e270d2d0ddd0c1ee0eff8dda1be1924c69cbd5616011f93154204d249338 SHA512 27a693613fe6580974d0027e463914c2aec8404e48d2314cd8e7d8022cb76d4ad84a27b8067c3e54c96761f3d71b07689f23d55c7632d16a709f64faa37142c0
+EBUILD ros_base-1.3.2.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
+EBUILD ros_base-9999.ebuild 509 BLAKE2B b388945f4b17d03abbdb00d80783822eff2af322e91555854571f64a90323ea7d565eb90da7b1d037536cec62c61ed2ec248bcbe43d25caa360087e7072079a5 SHA512 661b92bc7069ba2b0fd80587b132176156800c5f89cb50145f2b41f76a884ff7f3ae5281ae5d6e9463f3e5cdf2a969f6f2dc9987f07708addc64baef99cf76c6
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_base/ros_base-1.3.0.ebuild b/ros-meta/ros_base/ros_base-1.3.0.ebuild
deleted file mode 100644
index f0991587b06e..000000000000
--- a/ros-meta/ros_base/ros_base-1.3.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage which extends ros_core and includes other basic non-robot tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib
-	ros-meta/bond_core
-	dev-ros/class_loader
-	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
-	ros-meta/nodelet_core
-	dev-ros/pluginlib
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/ros_base-1.2.0.ebuild b/ros-meta/ros_base/ros_base-1.3.2.ebuild
index f0991587b06e..96e3b6f80ab5 100644
--- a/ros-meta/ros_base/ros_base-1.2.0.ebuild
+++ b/ros-meta/ros_base/ros_base-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,6 @@ RDEPEND="
 	ros-meta/bond_core
 	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
 	ros-meta/nodelet_core
 	dev-ros/pluginlib
 "
diff --git a/ros-meta/ros_base/ros_base-9999.ebuild b/ros-meta/ros_base/ros_base-9999.ebuild
index f0991587b06e..96e3b6f80ab5 100644
--- a/ros-meta/ros_base/ros_base-9999.ebuild
+++ b/ros-meta/ros_base/ros_base-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,6 @@ RDEPEND="
 	ros-meta/bond_core
 	dev-ros/class_loader
 	dev-ros/dynamic_reconfigure
-	ros-meta/common_tutorials
 	ros-meta/nodelet_core
 	dev-ros/pluginlib
 "
diff --git a/ros-meta/ros_core/Manifest b/ros-meta/ros_core/Manifest
index e50a7defd3f3..0dcf0b27148d 100644
--- a/ros-meta/ros_core/Manifest
+++ b/ros-meta/ros_core/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD ros_core-1.2.0.ebuild 767 BLAKE2B 1c991ead12d1b01cc1247e24abfd48e00326cb2a42ebce6400a505c6371fa0da9354ca9d8f70d2527ff7ee8a66ccf888b72f19ab41117281b9cead9abbe2515c SHA512 6184fd996feb7c8d1bd47ac95d716ce76fb484cfcc9fd2147c56435e846c79a4b8c43d8143d19820b324a1f82aecf9b7144a1d5952519ac3183ba133ad427473
-EBUILD ros_core-1.3.0.ebuild 786 BLAKE2B bbd0af294953bcd52ff10b26637b7ca0a1f82d8537bf04b7260ae3c6d6c09e1f39fce68b5b4ae6e1420c8704cdb8f4cf67c6c36b677ecd29d6afffc7dfeb0faa SHA512 d2d258a9d7ef95240da4017a72d86f75d4e18f3f05fd4c131b97a91bd705ff216ee5ee0e2988405970df975fef4e9feb64be630633b16a0d01f1ae9a856a2c17
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD ros_core-1.3.1.ebuild 786 BLAKE2B a8ef6c213e6663a0ab2ab5ffdab130d15d7b1bcd6a8efbe50e708162614c004b38868bddb60f10baa88ee41a6d40e26a55f9a29b062146fbe999c474cbf5c1dd SHA512 47b4af331afa9250f1b246d0c76c37c4375915234446fcf59dcb21d1b2ce1a76ca619d226f8f591d41441256c5e8c6c13c007d7740e66bec28b7f0c0884a08fa
-EBUILD ros_core-9999.ebuild 786 BLAKE2B bbd0af294953bcd52ff10b26637b7ca0a1f82d8537bf04b7260ae3c6d6c09e1f39fce68b5b4ae6e1420c8704cdb8f4cf67c6c36b677ecd29d6afffc7dfeb0faa SHA512 d2d258a9d7ef95240da4017a72d86f75d4e18f3f05fd4c131b97a91bd705ff216ee5ee0e2988405970df975fef4e9feb64be630633b16a0d01f1ae9a856a2c17
+EBUILD ros_core-1.3.2.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
+EBUILD ros_core-9999.ebuild 793 BLAKE2B 4744a38faa33dabae018151764065fd023db5d0088dc35d78823c961c68600581e3a88ec2c3b7831c51090cf6ef7c540c6be293005324e1c059ce070b765e6cd SHA512 3205b2deafd71b0a71efe24c7431242cd4ee90378f7e5faa94ed4be50de1bf2dd4886243fefe2d37a094bb3f4a07e49484ca0b165246d836e52d18748fa0df31
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/ros_core/ros_core-1.2.0.ebuild b/ros-meta/ros_core/ros_core-1.2.0.ebuild
deleted file mode 100644
index e0074ba5f1a7..000000000000
--- a/ros-meta/ros_core/ros_core-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage to aggregate the packages required to use core ROS concepts"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-util/catkin
-	dev-ros/cmake_modules
-	ros-meta/common_msgs
-	dev-ros/gencpp
-	dev-ros/geneus
-	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/genmsg
-	dev-ros/message_generation
-	dev-ros/message_runtime
-	ros-meta/ros
-	ros-meta/ros_comm
-	dev-ros/rosconsole_bridge
-	ros-meta/roscpp_core
-	dev-ros/rosgraph_msgs
-	dev-ros/rospack
-	dev-ros/std_msgs
-	dev-ros/std_srvs
-	ros-meta/ros_tutorials
-	dev-ros/roslisp
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_core/ros_core-1.3.0.ebuild b/ros-meta/ros_core/ros_core-1.3.2.ebuild
index 83c1c3c445b4..ebd39617e81e 100644
--- a/ros-meta/ros_core/ros_core-1.3.0.ebuild
+++ b/ros-meta/ros_core/ros_core-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,20 +21,20 @@ RDEPEND="
 	dev-ros/gencpp
 	dev-ros/geneus
 	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/gennodejs
 	dev-ros/genmsg
+	dev-ros/gennodejs
+	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
 	ros-meta/ros
 	ros-meta/ros_comm
+	dev-ros/rosbag_migration_rule
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
+	dev-ros/roslisp
 	dev-ros/rospack
 	dev-ros/std_msgs
 	dev-ros/std_srvs
-	ros-meta/ros_tutorials
-	dev-ros/roslisp
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_core/ros_core-9999.ebuild b/ros-meta/ros_core/ros_core-9999.ebuild
index 83c1c3c445b4..ebd39617e81e 100644
--- a/ros-meta/ros_core/ros_core-9999.ebuild
+++ b/ros-meta/ros_core/ros_core-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,20 +21,20 @@ RDEPEND="
 	dev-ros/gencpp
 	dev-ros/geneus
 	dev-ros/genlisp
-	dev-ros/genpy
-	dev-ros/gennodejs
 	dev-ros/genmsg
+	dev-ros/gennodejs
+	dev-ros/genpy
 	dev-ros/message_generation
 	dev-ros/message_runtime
 	ros-meta/ros
 	ros-meta/ros_comm
+	dev-ros/rosbag_migration_rule
 	dev-ros/rosconsole_bridge
 	ros-meta/roscpp_core
 	dev-ros/rosgraph_msgs
+	dev-ros/roslisp
 	dev-ros/rospack
 	dev-ros/std_msgs
 	dev-ros/std_srvs
-	ros-meta/ros_tutorials
-	dev-ros/roslisp
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/simulators/Manifest b/ros-meta/simulators/Manifest
index 7f3139b857b0..9a10b5a7232c 100644
--- a/ros-meta/simulators/Manifest
+++ b/ros-meta/simulators/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD simulators-1.2.0.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
-EBUILD simulators-1.3.0.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD simulators-1.3.1.ebuild 459 BLAKE2B c19449e9bc9f7023b332baa3e89b9769d4eadbb1e4f1f4fba5802aa666110e3d89dd779f4d85fead356dc31c20d7914ebeadb35d4dd573e1683c1a6f2d57a0b2 SHA512 1081400d1256f5d94216b2d76b62bf6af4e3d98b294f2d2ec1ec8dc8d83eacc6e6bbc428918a5a84334626739c82a45fb6d101400e11b887d6cca12d7893c0f1
+EBUILD simulators-1.3.2.ebuild 459 BLAKE2B b64edbc084f8baa0f473d6bb8ab2a402f5f581776195270acb07df6651c9e403dfe867883e468bdbbee1e3e77d22694fd03817543ae54a18496b8ded769f32a8 SHA512 d9352711a79c0c4ec87252cf32574ea2fe27db74a82549da983a9fc1b35c629228b99623e4cdeb10d6374c644d7c798f20fea0cfa928e59625dabbaee9b5ae03
 EBUILD simulators-9999.ebuild 459 BLAKE2B 7bd07a1c5578b04c097229f411cad97b02d23e4b7d436745d1e6d0e87133428ff11d53514b617043f4b9694079a4074cbb2a56f3d0224bf0ba48658f0f9a65c5 SHA512 8d22e5f9b25035cd7560b3d350e1a6c350f7cc6dabdd5733f92d97a15a0ad86fd57dba79f05e2fdc1bfce1ad0dadfccc5c22e0e4bb0fade98bbe3af4e0049f46
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/simulators/simulators-1.3.0.ebuild b/ros-meta/simulators/simulators-1.3.0.ebuild
deleted file mode 100644
index 6eebc4d7dcbf..000000000000
--- a/ros-meta/simulators/simulators-1.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS simulation packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/robot
-	ros-meta/gazebo_ros_pkgs
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
-	dev-ros/stage_ros
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/simulators/simulators-1.2.0.ebuild b/ros-meta/simulators/simulators-1.3.2.ebuild
index 6eebc4d7dcbf..bdbe43f05722 100644
--- a/ros-meta/simulators/simulators-1.2.0.ebuild
+++ b/ros-meta/simulators/simulators-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/ros-meta/viz/Manifest b/ros-meta/viz/Manifest
index b5ac8d91509f..5411447b8a05 100644
--- a/ros-meta/viz/Manifest
+++ b/ros-meta/viz/Manifest
@@ -1,8 +1,6 @@
-DIST metapackages-1.2.0.tar.gz 1803 BLAKE2B 92238eddd05602507c91ae0ef1def2eb0a7608ca76dfed4579e9d5daf85a125f256ccab9b980389131aa3733d0ed8887a7f23b4945c9969291f5c7dd6029b283 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80
-DIST metapackages-1.3.0.tar.gz 1813 BLAKE2B f197af8c8db8ec6368597ce185dc48058b8e74e84952c92c549617fb48e261fc909f569e9a4f1b7bfc591123960ed38f07e2b36dac130e7c76061993d5d07e09 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12
 DIST metapackages-1.3.1.tar.gz 1813 BLAKE2B 5b96d5c6fb8094a42b1c9926646b1a335525080f7f57899271063cb8561dd744f8131e40716d9aa5cd29d7205bb76f8f18b48a42ef764d863bb13ad274f46d14 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1
-EBUILD viz-1.2.0.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
-EBUILD viz-1.3.0.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
+DIST metapackages-1.3.2.tar.gz 1923 BLAKE2B 39de3b6850eb5e980ae93e2af3b6d17523122a7b30930bbec9d8f706ece4cae6244b433991ebd0ea165515667595c2c7ea6bd39c14b9a78acf8065f42a864a9d SHA512 8cee2f06638989f5e33981af87db3d3dc07836ec5bf8dcf4e9bdb8f4afd09a3b427341f397d973333d318c704b21b6f0b2acf97cb4e18beb8a58dac559419ab0
 EBUILD viz-1.3.1.ebuild 434 BLAKE2B 8fa2a335a216f9af99da7807db102143b8a0bb37e9a322d8f0c3265d2ed6d1bca45832f0a6221a6a5d1178cb2c081f8b9cd2b55a9e2d0772c020ca8aa7f3c316 SHA512 e7beebea2671216385a521138cb82c65ca6595288c5a741f20d8931bebeab97427a4e71bf6b2e84af084e453b8833cc1acf5dcdb858a45f8f69795e67235f9e0
+EBUILD viz-1.3.2.ebuild 434 BLAKE2B 20fef374704aec5ea06e301211476e7f58d67d2a9bfb6d29e55d1d182c5e4a767293cf787a3490305427df64f521ceb318a8a63f382b8106cf6e54fceeab656f SHA512 db6e74f589daecf28cff97c2aeaca7d9d72d61ee2d84136a02392ef9579b994c8e71691e515887a3692f1df0c6cd0349af09f7e38432765a1db83a787a86f0bd
 EBUILD viz-9999.ebuild 434 BLAKE2B aa7cece1a4df982822c4c4e2bb8d2f35cbb8323ff10c8b6db41161e119f56bcccc3080bc10e1741a0dfe889ce1d6b49597ad05e697066763aea4f920b89e3110 SHA512 e414334a461788fa261c681474d288dd3deba70cfbcfc8f6f5bbf1f395f7f55dad661007195ee9cb4e2f7a583866b96b3c5f0f5bc30a9dade8b0ad63bab40663
 MISC metadata.xml 330 BLAKE2B 36f43f490574870aeef3890638e64a34286ccf546cdfc0451b5fddeefef2e32dffa69699d6154999c54368cdf7c42974800efa44515e6d2485d36acb04f9197a SHA512 62a9e0730238ae6511441116167bd835c785291f6db65c554a68069e69b81a713f1ed7a46cbc30cafc64377b170c3f94ee979140013c11f41af9f43906214da5
diff --git a/ros-meta/viz/viz-1.2.0.ebuild b/ros-meta/viz/viz-1.2.0.ebuild
deleted file mode 100644
index b606511875f3..000000000000
--- a/ros-meta/viz/viz-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/metapackages"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Metapackage for ROS visualization packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	ros-meta/ros_base
-	ros-meta/rqt_common_plugins
-	ros-meta/rqt_robot_plugins
-	dev-ros/rviz
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/viz/viz-1.3.0.ebuild b/ros-meta/viz/viz-1.3.2.ebuild
index b606511875f3..24e9886bfad4 100644
--- a/ros-meta/viz/viz-1.3.0.ebuild
+++ b/ros-meta/viz/viz-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 37e662608946..625d4d8a2ee3 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/qrna/Manifest b/sci-biology/qrna/Manifest
index 2c08f3038817..fc5186011f1b 100644
--- a/sci-biology/qrna/Manifest
+++ b/sci-biology/qrna/Manifest
@@ -2,5 +2,5 @@ AUX 26qrna 30 BLAKE2B 07faad9f2143edab789c29f999182e76a87ae82b9e6fca3346fc6391f7
 AUX qrna-2.0.3c-glibc-2.10.patch 7571 BLAKE2B 3361fa6c31af0fa7f01e3c32bce2a8570df69b06517f9eb46a2f4f249acc972ac15da4fa5b9c1211efeaa91ee7d41f5c5e2392d89ead41252b5f5675826d4c21 SHA512 afa8767baadf99dafbb0ce4fa8b31017f6a12e1eadbcbd41a7e04e571d3f059395356178df3ab28f8c03c10f227123361590357c6ace6256727322ade00228e6
 AUX qrna-2.0.3c-ldflags.patch 1368 BLAKE2B b3f5cee42c370545e348e86627981d4568a84a673faf32d041b0ebbce0e782c8cab1aaa41c2c48f43704886035431c64b035a99b98225363f5ca2d0b8b9c0dc2 SHA512 4b1be14c664056eebb914e8c8223686ef0f345c860bd5aca82dced67b9580a205ef9539c563c0b0c646a9781ed0c58c4cec69d71bceb2c410dc485e9b5881c54
 DIST qrna-2.0.3c.tar.bz2 6423705 BLAKE2B 42bb2f03bac4034da9bcdedcd7c09ce7d1892ceb14d5682745d77c7575a84ae1a6a598406895be2a844ceaffee045ec6357ad08cc0d67a1312458d11b6540fda SHA512 98710bcf8993e2c09ec1eb33632a18ac993ab817dc95a865200b0868f79b95ff61f5f7d3f0c1c33de6d26f674025ea11a8c7d8175b96071e4594daa252fa52b5
-EBUILD qrna-2.0.3c-r2.ebuild 1112 BLAKE2B 4a72757056575d7aa9036fa21158393f6eede3c0e1965ab59c04704c725ba10dd037776d6e3c353a9942b1cbd464da182c375289ee6d45a3d5d74fc40d85958b SHA512 70e7e97f322970434fc5ee5abd8b75ae085fb588ea467673e01ede4b4778e819e41df83f9df1fc1d10e6ede9b52d5356519f8c4987d654f4038fbd7c5c90e853
+EBUILD qrna-2.0.3c-r3.ebuild 1114 BLAKE2B 737bf8541a3812727d8d2c8adba527cc259b52fa88ed411c56c91a5783b3bc41d001da59b67ae79f02df48fda79859fae352a00dae452de291f1a7bce93676cf SHA512 008cb677ee7548fbae56f87e0394f135cc89c9811ad598157cb1b2ce2f708a715bb8a9b841b5348ef2647dd4a488905960d0a6448d5c13fcd05be61361c4de37
 MISC metadata.xml 261 BLAKE2B 3768c926bca545090342a947ba83e706a8954c51b99a5e7b3476ba5198cd326fe1c3b8efb51dfd6be1800682556b8ceea065e388981463ab32f3d687951872f3 SHA512 537da0d3aa2741ebe4442d5dd9b53409decfc9d12ca8e5af8e737c4deb2910c884207e2d441025d19469816100889f04c11038bdffd6a1a15c6217495445090a
diff --git a/sci-biology/qrna/qrna-2.0.3c-r2.ebuild b/sci-biology/qrna/qrna-2.0.3c-r3.ebuild
index ea79f2d548f6..5c580a24d2a3 100644
--- a/sci-biology/qrna/qrna-2.0.3c-r2.ebuild
+++ b/sci-biology/qrna/qrna-2.0.3c-r3.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-lang/perl
-	sci-biology/hmmer"
+	sci-biology/hmmer:2"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2b125818e67c..daa6bb0f69fa 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest
index 2be8fae903a8..7528fdb08766 100644
--- a/sci-electronics/gwave/Manifest
+++ b/sci-electronics/gwave/Manifest
@@ -8,6 +8,6 @@ AUX gwave-20120229_stdlib.patch 396 BLAKE2B 4242963c3fc41d2ef86777f7e055448eaf9d
 AUX gwave-20120229_unistd.patch 802 BLAKE2B 95d5b62714b25e8dfd6f7158303b92fcc2a8d3951af1201c714ff6d50691467df3b4235136d64d66c6e680131fb92f94d016c9398bed8a253e32b6c74895c206 SHA512 4b45b5606072675e3bede8852c5aaa25f25d2d9544970cf5eb81f896ed9c65fcc18e7f301254490165736b07dd9203e63bab93681366482baff8d995f0c105ea
 DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87
 DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c
-EBUILD gwave-20090213-r1.ebuild 1222 BLAKE2B 7a47107b3011033742fa460e174f05524da9bd4d73551edcd3c50c8cd10bae8d4c0268129f12904a15ee56eb421dab313e2c3098cdd41da73187a24278be852c SHA512 29fb7ac7333112d58ae9d38d35271d58f6a93d4f2803459e8ce600ff1be252a7413735e23119d0ae36a2d9fc64d65f5fef0743b4c46d9e5be1a19624f08b5d9f
-EBUILD gwave-20120229.ebuild 1712 BLAKE2B afc61db9bcab6944ffb3d9ad659f5119fac3ac40c44cdc44da4f9ba35db45c3c1536218bb8dd21b9a9d0a15c6293959a75b55c413696cd3493e0b354572137e9 SHA512 b7919338caef879a569a317391d556583356cad3f0c63494e027dcbac5bc231ccfd07d822812df1281e4c727a3971ce7cc9d1307a2e25e3222f6667b9ca256d0
+EBUILD gwave-20090213-r1.ebuild 1218 BLAKE2B d22a108b44951bbcf8b9f306d8e97e0a7d2f440f87c10866c363008ce8edfa303f10ae81e1bcb680e423183de0d62e3433170cffca7dee9f6ae74c4326974ff0 SHA512 9a7a38cf7911322c80326cfa8336b5afc03cda2e58152edac77a259f5dde581bf5bc95f3bde2ff733b9b0c797ef74f579e04ab41928de1e1a23c7d2b4b2c7d32
+EBUILD gwave-20120229.ebuild 1708 BLAKE2B 5a8662ae3d1ba96439f5ca226d765b70831217ffb8e8e50f7a4396a5ed10c8a06e1cbc72029d0892464d46c5a2aaf144d4c791f7df9b38e8601c1876f613ed19 SHA512 5e418edfe1f85fb4bcd09d8a8bb77e49bd98105d87696d49c7fcd3e5362d570abcb71355e27dd5b9cc4b06972faa0d707ee6bd42b691a3330fada82b772d5e56
 MISC metadata.xml 729 BLAKE2B a7e62f3f754e700c62e9d43f473837302c704b9ca800ece31a152cbfcb56024db78b4ebbdd7b6d68eb31fb026962ea630661b06668d257d1e0cbfcb160c30ecd SHA512 c38f63a842618cfed2e78374219eaabb16a0cd9198ccb339701e1a4a86cf90689d12a70277b19dc781522f9b67a7ab740fdb5475c1eda0d9cdadbe4556ee2966
diff --git a/sci-electronics/gwave/gwave-20090213-r1.ebuild b/sci-electronics/gwave/gwave-20090213-r1.ebuild
index 14779b8361a6..22101b0a0ea6 100644
--- a/sci-electronics/gwave/gwave-20090213-r1.ebuild
+++ b/sci-electronics/gwave/gwave-20090213-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 HOMEPAGE="http://gwave.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 x86"
 IUSE="gnuplot plotutils"
 SLOT="0"
 
diff --git a/sci-electronics/gwave/gwave-20120229.ebuild b/sci-electronics/gwave/gwave-20120229.ebuild
index 2409fa2235f7..acd8cfe91817 100644
--- a/sci-electronics/gwave/gwave-20120229.ebuild
+++ b/sci-electronics/gwave/gwave-20120229.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 HOMEPAGE="http://gwave.sourceforge.net"
 SRC_URI="https://sourceforge.net/code-snapshots/svn/g/gw/gwave/code/gwave-code-${rev}-trunk.zip"
 
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnuplot plotutils"
 SLOT="0"
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 56f370c9a868..17c21036b64e 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 7f254647f75d..b88c9769c648 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -11,6 +11,6 @@ DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e26
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
 EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B db6c6fa1262605f1595cf0f7ee63c8126e80b0f5fbee6676a52729a1f09ca6b40e00502ee67490807302549ecff490b1c0ed6b5c8d7381695875cb2fa5dfdb5b SHA512 2c4bb08747a740f7fb9e3405245163e2b628c40fd1d95123afd2f364dd35e77dbf7bcec52fa77069d89d4a37f0d62fd36000d3e1d77c635171ae8d8c5336b901
 EBUILD qgis-2.18.16.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6
-EBUILD qgis-3.0.1.ebuild 6261 BLAKE2B 8556ac138da411afe23e708ee7945d6755dbe37e1cef7f4870351fc6b0d26935e2b3d8c325be0f90cea6d2fdca2d30723e7d2277ba3872c6097c61f1a944c416 SHA512 9fdbd919c8c56132bb68e67405f2f4c1da5221aa1fbdd359dd51cdd2da92d911f683fb86079068fa8d54fd181d03f56258560fa05d7f626849b6f29317622a5b
+EBUILD qgis-3.0.1.ebuild 6260 BLAKE2B 09181406e5d666311c874088228d5403224aa370341e2992063a4e0152b100ac8336ebd5e6c69c010d8788c1b8a177d6d1edcc597a662c2268ac1552be6824ea SHA512 f3bfe67d90b1649a35133933b1561157924e291bfeb4d76eb80684e8e3b42c5f8ad01f6d5146325db4d9dbe278c115f50ae11ddeee6daf83245cc95a02af3e2a
 EBUILD qgis-9999.ebuild 6161 BLAKE2B 1e55aece92a60ce8cfd7b4d5265f7824c8a8a54b1d996fd83852a78cf34e9cce4458a7e7d4f2f8c096c49df75d3daf4ef54fac4ffd992c84621a4ed5f5f08abf SHA512 fab722837d024b644096643096c7549453bf95b71fa17bc5f8afdedc85db425a47967e32591aaded01c22108652dfc5464cd6a28d76153f0bfc5675345469de7
 MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700
diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
index fcf4f8846c70..882d915e20ea 100644
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.1.ebuild
@@ -10,7 +10,7 @@ QT_MIN_VER="5.9.1"
 if [[ ${PV} != *9999 ]]; then
 	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
 		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	GIT_ECLASS="git-r3"
 	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 6db676f714de..dc3076fd9486 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index a0c44b92ef3c..b2c05787f129 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -10,5 +10,5 @@ DIST p95v294b7.linux64.tar.gz 6244730 BLAKE2B ca5d0aad96e9bd5fb1bcb232435a26b7d8
 DIST p95v294b8.linux64.tar.gz 6244091 BLAKE2B ec02f582296f8959765f97526646f2f4a679a2b61d3c8e8efc971bf765c7f3b5cd4a9e2667661bcc6b0a3a088d095671af9b1f371f0e671de495935d582bf8e7 SHA512 bec8ce2081e9e349317441bbaa724e5d21ddfa1e328ccb6a17af796d41b201d96b2835fc2afcd68e350b22213225812cafdfca7973a7cd2071c1460188b3245d
 EBUILD gimps-28.10-r1.ebuild 1432 BLAKE2B 5045f454adea032d8d608496639066e56f73b890fe5f95477b4e5fa2550f09fdf59e4697885c351d645743c35631dcbdbf531ce46c74410c4d8faebfb71cb2ad SHA512 f6a39f5b852747c7c50c9ae276cc3393d30d057c6f80ec291de14ff1bb9e0fda109f1d5c7c9df7d2c45846cc6dcb07782e3e5bf60dee01622b702ef59b6985aa
 EBUILD gimps-29.4.7.ebuild 1747 BLAKE2B f6734382130b1429b750325b635fca81132941888ab5ddfab49ad559ff21f1b7d0884f9075e7f91596fb708002b2867b31d4e1d7ec2dfef5a35b923720a68d44 SHA512 716e75cb9c3d2dcbf1abd733836b6155e9684857a435f18889ad340fd5bf94795fa0aa0f41df462b6e2bbab76d810b3aad07c3b9b5230abcb2ddb32dd646a7c1
-EBUILD gimps-29.4.8.ebuild 1676 BLAKE2B bdd604a24b5538ebf2fc0f1a5f06c08dbe99796595ed83d3da0a999c235320385943841b7d14811d11afab2f2b504bca2d8df352b9db5a8f202ff710d3e4085d SHA512 b6a160eb43bdd40d2739682406284af0ff7b7a3dc2cfda48837021a3e3b3838ad6ff7526fa53e4aa083fca7f55c9e2ac63eb602efad7ec853128a0e47f541075
+EBUILD gimps-29.4.8.ebuild 1675 BLAKE2B 97a5f7873735863b936afffa3a4086b7600c95abcb83527cfd6ec776dae035724681d27c52cc694ee81dc8d28a477daeccca6bc383b46504f303e023adeacb94 SHA512 abac150f784346a2324e60c7b1b107cdf9aebfacf4dc1e102f2212afcc91e0256369c635d4687d3abd95b191d6f1efede52240ed4276a7020e324cedf6725b88
 MISC metadata.xml 529 BLAKE2B a6e3550d128d6c4801029726feb868aa1cd1017b8a2f6f7ebbb3743a7b2190d40db06d22eb4f8ce94e35ab5e6b1f213afdf179fe7777501ad87457be43d9af44 SHA512 a7fb9bd05f987e1d48a04b70e78cbb3906927197793870435fee8b68dd9da623a68fc30ca96d0173952414d9741674ba2cc2c3f821dfd7b302f91f09e887a362
diff --git a/sci-mathematics/gimps/gimps-29.4.8.ebuild b/sci-mathematics/gimps/gimps-29.4.8.ebuild
index 00bbac082b1f..6b8dcbf65197 100644
--- a/sci-mathematics/gimps/gimps-29.4.8.ebuild
+++ b/sci-mathematics/gimps/gimps-29.4.8.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GIMPS"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 02016d2d9ec5..0ca74b054568 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 9aa4d92071dc..588dc98a0a5f 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
-EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-2.0.ebuild 1208 BLAKE2B 1359b21e86449a987681f2058c972f5b392122944346b18c901b82fa8b51c34032fdeddb6cb38390bfc3a38606e0e93373c12ca71fac58f524cdb0767cc3c59c SHA512 7ade695a7630cfb39a7d9d652f617c8236fce594fe9cbc8e96faffb9ba34babaa8ae7175dc901f3f122827a3b8ba7a5a14816831bbb0e69f2f8b64e9d303dd3b
-MISC metadata.xml 571 BLAKE2B dfb5414d647ae661fa1aaab2e5a301ce80a5306f1c658ce2448368fa2dc4b0f3f49d0084de0b5f0bf9e0f00f1abe4c6a441f68d5abe0a610ac13a4392a0343f5 SHA512 59eaf4a789189b5f02fbf945a26cddc46c3ca22ce0aeb5b0311768bf8af21bb80081bc31f859add067a32a6a7840343af43d0680913c0422161efb0784b09a8f
+EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
+MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-1.12.ebuild b/sys-apps/bleachbit/bleachbit-1.12.ebuild
deleted file mode 100644
index 927359b5e594..000000000000
--- a/sys-apps/bleachbit/bleachbit-1.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt lv
-ms my nb nds nl nn pl pt_BR pt ro ru se si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 eutils l10n
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk nls"
-
-RDEPEND="
-	dev-python/notify-python[$PYTHON_USEDEP]
-	gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=( README.md )
-
-python_prepare_all() {
-	rem_locale() {
-		rm "po/${1}.po" || die "removing of ${1}.po failed"
-	}
-
-	l10n_find_plocales_changes po "" ".po"
-	l10n_for_each_disabled_locale_do rem_locale
-
-	# choose correct Python implementation, bug #465254
-	sed -i -e 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use nls && emake -C po
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use nls && emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/${PN}/cleaners
-	doins cleaners/*.xml
-
-	newbin ${PN}.py ${PN}
-	python_replicate_script "${D}/usr/bin/${PN}"
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/sys-apps/bleachbit/bleachbit-2.0.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
index a3c40b185337..480ea80045ac 100644
--- a/sys-apps/bleachbit/bleachbit-2.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
diff --git a/sys-apps/bleachbit/metadata.xml b/sys-apps/bleachbit/metadata.xml
index 1ba6f1e4b71b..b025f5f8290e 100644
--- a/sys-apps/bleachbit/metadata.xml
+++ b/sys-apps/bleachbit/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">bleachbit/bleachbit</remote-id>
-		<bugs-to>https://bugs.launchpad.net/bleachbit</bugs-to>
-		<remote-id type="sourceforge">bleachbit</remote-id>
+		<bugs-to>https://github.com/bleachbit/bleachbit/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 29ae108c8738..142f91a1d328 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,5 +2,8 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
+DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
+EBUILD etckeeper-1.18.6-r1.ebuild 1768 BLAKE2B 31e5a00dab3080b8e2241848a8d2c510b732d0330fc9b732d72e48789b403e65b52fbeeb0f73c8b1b9b7f5afbdeb9cfa7c30932dcf1ba1159c58a773a9945932 SHA512 ac0fac599f4b7917486c671ac949eab706103d0304e2a157267224a07fd6af449565de66ec13988b383380f8624ed443cc1d7b0872a18abea11a2cad93d79781
 EBUILD etckeeper-1.18.6.ebuild 1711 BLAKE2B 9f338ff11900fb652bb9f942dc993caed137ac5fc7af58e8b8741252f1ecac3f328c771f137533b5dfd7afab30acb186f67ac52c476023ffd0379ece8a202ec1 SHA512 870d331516eda64ee50228751d1d6552359e8b7fc8afe57293d2415d3380653185729e22018b17773b5573f1b151d3c46846fa5e226b6a6a66f9203b775913e7
-MISC metadata.xml 780 BLAKE2B 82a4dde4c7c0f01d2bc47b85c0135d305f70515136415ad3484136e87b10ddd67e5317fd711fc758aee6a6d192e218e9b0259819708742de1842cb80437f46b5 SHA512 7977587ec28b947dca79efd21c0f5ec9244b52cb29d663e33952bfc9c64730eaa6b3a5e6c97387028bf2434da5f7cd4ff92c22f1d6bd5ff13071aa988e991bda
+EBUILD etckeeper-1.18.7.ebuild 1852 BLAKE2B 986fc04533c6d045578aeff774c1d7984a116bff863ca56b58f95f8a7852aa787b7befec61ff40dc957a28d25925a856cfdb87a9917e6a8b88d2c2ad5f3f5225 SHA512 841c2593f2f4d251607cbcf4345232fcf8bec6f940590126d9681f2d680e8b60a9cb87c1e76b17565b87325663f7b0cc4c11349f492ac5b8ee06c6d7602a6deb
+MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
new file mode 100644
index 000000000000..3f0dd55eb8f8
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED%/}"/etc/env.d/99${PN}
+	fi
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
new file mode 100644
index 000000000000..f18078fe62db
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron test"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+DEPEND="${DEPEND}
+	test? ( dev-util/bats )"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED%/}"/etc/env.d/99${PN}
+	fi
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 877ed977addb..380a1241b6ce 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>m.j.everitt@iee.org</email>
+		<name>Michael Everitt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
 		</flag>
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 1b7a5eaa8491..067c54b65cdc 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,4 +1,5 @@
+AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 786 BLAKE2B d782847e33dd168b04166e401f566b897ea7fe1a9ad5019dcd585ffff492c7a9deac87fe7648123b9b55072aadc4148d59fa3704cf8d7a0379b5dd8e01765d85 SHA512 f0b00c7bd7b09834fec17b0dfbb3e4195980f62289d8a66d9e69afc3df2663611feb819e3b062eaf168d3f83d9e11ec6e876829f08f81b63828fd0adba6bdb21
+EBUILD fbset-2.1.ebuild 831 BLAKE2B 2ee17aa299c8376ae0d84432bcba1886ba0336f1a5e7c25df06bcb7499b11940769d3b612b17f948ef07243ea2a6e1e5d78bd58a3da4a33ae8aca98ba804e4cc SHA512 775c291e68bbc213f5f834d6d330b36e665eba635e326a1aad78ea060624943aa9dbd835a6745aaa2e2185ff909d6bc97eac66938bc0af0201500f8efb09994a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index cd50cd3945d2..1c334fdbfb9f 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="A utility to set the framebuffer videomode"
@@ -16,10 +18,10 @@ DEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-add-linux-types-h.patch"
+	default
 }
 
 src_compile() {
diff --git a/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
new file mode 100644
index 000000000000..589d61b0ee8b
--- /dev/null
+++ b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
@@ -0,0 +1,11 @@
+--- a/fbset.h	2018-04-05 18:17:18.292975594 +0000
++++ b/fbset.h	2018-04-05 18:22:20.448747231 +0000
+@@ -17,6 +17,8 @@
+ 
+ #ifdef __GLIBC__
+ #include <asm/types.h>
++#else
++#include <linux/types.h>
+ #endif
+ 
+ #define VERSION         "Linux Frame Buffer Device Configuration " \
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 218e2e8ff90c..517f1b4b4689 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,5 +5,5 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a
 DIST haveged-1.9.1.tar.gz 474845 BLAKE2B bec7ecaac93f7b6ab746dcb228172272bf7575e33d6ea1e2d1cc8a8fa63187db5e41565a5b49d922c6f4c222d71452e41d0b2dd00984eda179a8026fb76432ce SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 EBUILD haveged-1.9.1.ebuild 1002 BLAKE2B c63e879cf82aa18711e357aa62f49ad3f76fdd3b219dd1ef5241585deabf93106428731461d721aab95046ef82e83e67ccfe7e9e919177d927787e47eec25bc2 SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59
-EBUILD haveged-1.9.2-r1.ebuild 962 BLAKE2B 5e9df271a30602c3b109209bee32942aacfac2bfcd0c393334e9193f6e196a067d5b3a0f098b2c2d1b5f52ff9554e5e79abdc2395dae6aea150f61ba4c1cb86c SHA512 6779b13cc7fb9e0a79d0a7fa180c800d0adf544eb27c81e44a6e48e7496b306bcadb5680c61233ed76eb1f273a58f35889d12f147041bab7b81b75875951bcd3
+EBUILD haveged-1.9.2-r1.ebuild 961 BLAKE2B e8c31b46e38b1dec8c4f504998026451154ab9275ab22bceaac36e4493481d7637ab20a63ae5f85956030f827d6f54acebe7cf8e6551c1b5ee7cd85ffb550d75 SHA512 e75771e470aa9d1c19336e2657d79ba3244656e4f620a82187d3726e430035f18de45aef09c7242ffdff80ded0f9d277348eb91693f70dc6cf8a7293d7cc2735
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
index e43732a8d98e..36adaf84b922 100644
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="selinux static-libs"
 
 DEPEND=""
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3990037954e6..b46c1882788c 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -3,9 +3,11 @@ DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa
 DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
 DIST inxi-2.3.55.tar.gz 471764 BLAKE2B 0615ab13b4d3164ea180b3c34ec6e2d4cacad9712d1c7d3161821398498ee31515db8a84019ac64f7e5c8bfda12473341869432dada4649d4d0e65f411eb0903 SHA512 4b5ca427bfe77bbce95f2889e118cc051c7219328f26c1281d8c4fff5b6de1a34c9813367a79d1a92f5808cbd13c669e463d6a5b965def7c3d4ed29c2aa91148
+DIST inxi-2.3.56.tar.gz 227754 BLAKE2B e3edc0cbe2bc98304b950f420f39f25d52717f7ebda83e7106b35e6b04c8fcef118108f95ebce53140ef50a017d3be1c02dd58653940c23b5e3049c3731c3b5b SHA512 db14a63f59cecf490cc456a4b9d7d7d42ee8c1041785c4635611634e3fbe653d2bcd39eeec3becb42e85d100bcb2d2fadba806566eeb8a6182cd0485e97ac1cd
 EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
 EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
 EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
+EBUILD inxi-2.3.56.ebuild 876 BLAKE2B 4c113e271ebf57aec54d9530aef8e8f3d1e76166e725af284c494cba3add1c98fe1b078ea442d3e9e9251b5111741a8d9d3d9c1938d60827da4bd4c8c2f9708c SHA512 4b5204f1a54084b4f8c88887241462b5d931dac2094925e24b43fd335e5dc65fc9eb95480c5c61c5b411f287ed1c7c41aa9dd491f159cd1e2db447e425fc0f3e
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.56.ebuild b/sys-apps/inxi/inxi-2.3.56.ebuild
new file mode 100644
index 000000000000..f07ed4edeaf8
--- /dev/null
+++ b/sys-apps/inxi/inxi-2.3.56.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_COMMIT="803a4595658f28decd236c6f8660841abc336cea"
+# ^^ because upstream refuses to tag commits with version numbers
+# 2.3.56 is the last version with no tagged release. 
+# It is also the last bash-based release.
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 6bb91435b180..014bfc65501b 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,9 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.1.tar.xz 1621664 BLAKE2B 94496c1ca912e7cea2c98be8443d5b13dd685c5af86e9996b625fae44384f4cacf24a4196d77a080da10baa385b5e63d8b090c2bfcc492f2a41757d7a3840468 SHA512 82e75df32eb8575f47c3f36b5f2bbc827776747abfa39af589802e6566636c0771df0ee3197cb2bec3318c3055ff4e9d04c7da13b3bc6ea8a1ea1b1340554ef0
 DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc
+DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
 EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
-EBUILD man-db-2.8.1.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-2.8.2.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
+EBUILD man-db-2.8.3.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.1.ebuild b/sys-apps/man-db/man-db-2.8.3.ebuild
index 627b8941479e..627b8941479e 100644
--- a/sys-apps/man-db/man-db-2.8.1.ebuild
+++ b/sys-apps/man-db/man-db-2.8.3.ebuild
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 69d97bbdd122..daeff9d2cc9f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,7 +12,7 @@ EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
-EBUILD portage-2.3.24-r1.ebuild 9270 BLAKE2B 56129755048817a6651fae7f243cbc89a17959c59371fb337542840ec3ca4543c1e5ad35143b0564f01ecc818b7a63748749426be91c002c8406d9f2eb78cc36 SHA512 efab90e8139a141d6d5466a2d9d67181d7dfe923bc0be3bc735b3107369b8a20485ad0ed3faef1c4ff105e5dadd0dd55533bcc251cf833222102fc46ed74b1d6
+EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
 EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.27.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index 979ffb137192..a1bbe006ba62 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
 
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 476e7580cbe2..5c26848e81b5 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,5 @@
 DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
 EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B 68332f62167add5091841d2d8c8c9ae9379296eea40471674880ec53034bc4a6da69d935042ebb57960a0996bc3a586a955fd7b69837e488842011ad3b8dd04a SHA512 2e13378c2cb765413a6fc87e6b4f6ded4afee8a27b5468b71cc17a688231acf656b9f1234d3b4fa84d3218430aeda4ee53120e80808ced958088109dcf05377b
-EBUILD pv-1.6.6.ebuild 1387 BLAKE2B c5ac5ecf279ea270868427da6ceecaf3423b1436d634f2731a514f7920ed926a17d5a07a974dc34ec5b857e13cfd04fa60d3863263bf56e14199b37a3e85f902 SHA512 615d2b1caccb65b522a620a640f4f2f4830e401076036d06eb9f9e08efaec7085baebb5426c546f03ab31b8f5ca7bb0ae2c5e0eee7bd070c5ad2d403a10fc816
+EBUILD pv-1.6.6.ebuild 1398 BLAKE2B c077a3b62bcff24b084e23059aba0edc526711b29fa64d853446b3b1730cbe83b1e8b3d05d02e8be930bdc9b976f6b9c634503a3b1fa6f0ffcf2f667653195cc SHA512 a96ce67602502c1113db6aa87cdaa1a40ce95c5acea04a765ffcb860efc14ccf37cd3e2abe33c511e38031d918c288902dadaa246cc3a5366fc13642dae42491
 MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
index a411e2bb0770..7cf983647200 100644
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ b/sys-apps/pv/pv-1.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index ad81a0000d54..276e8192bb9d 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.12.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
-EBUILD sandbox-2.13.ebuild 1923 BLAKE2B 4b552567f21a11c8e6e2487cea857576fb8c3bdb854065bda219e53fffd2ceee6c83298496cbd1d60f78001071454c2e0d5b73de1dff9278cf51ae483086e0a1 SHA512 1076542951779705bf9a9471ac8ecdcfc219e2a80485de7ae0714da4b7a9596ecfed32922fbc4b9c519aef77e3f61814b5b3244461d088d79eb3859868af71e6
+EBUILD sandbox-2.13.ebuild 1921 BLAKE2B 453e086893f5dd49ad5c12ea62e1f704b27c145e65e06e372b4396154955fe26dcb418d9bc96203e983dc7d0974662429966374c1da83d00be30069ee5548b08 SHA512 29334c088f2b3167158a215d1f30e5f1474ff9b32b853782e04f182a240b9d98db32d3c80a27101860ec1bc1e4208164615fd3b10f18ef95f680bd934add507f
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 2d2445ba3416..1e98ec137b58 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 181361ea3e37..111dffde39cc 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -7,5 +7,5 @@ AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2ad
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
 EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
-EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 9c7e25be14ed48bd3d042ace168a77b8e4bfe23af77824251d5a98c88a4d8f1e040ec1dce3a7c2c3057f3d41434a834d3b539b1f54323f5d1ddb6ebaa588e75a SHA512 b8cc99e72717f21ce08a955faa8007484c5d274e63b3c1975dcea20cb68b25175babcbc8dfc1fb85188721c0777512074257acb8f48e47b9a2c80d427f854776
+EBUILD setserial-2.17-r5.ebuild 951 BLAKE2B a6529756d8baa8977bbc666bb7a4ac94573018143fc07bd8f6a43b5baac655ec1fea996f4f91c464f94f3046419553d2622358cc1b33516e7289bede74e84f69 SHA512 a8abd5ae98440967244a3ab9e19325f5d733feb56e0b75ddbfb2df4cb8bda1a559eb33bca8dd59c62597a7cbf48ae153a0dcd8561a29a4e61d951c5bdae753e0
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index a5f8ca032da4..972b31c332b2 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index f06ce1e3447b..3f45bd60f347 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,8 +1,6 @@
 AUX audioctl.init 455 BLAKE2B 5e449ba3910ded2550dbbd367a2a4f63e3964a65b48d228078a30205a731c0270bd96d7bf4105d833b67fcbd2f0ae98de414f5b77f495172dac741498d94183d SHA512 6ae87679c9e51876551babfaa35126a7ae94c15edc21c630154130652a1f9f754c489c5406c9c3166157a45495d05668bb06bce79ab34053a0b74c34b19c16a5
 AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
-DIST sparc-utils_1.9-3.diff.gz 10337 BLAKE2B 03ee7ca15c4e736955fa08c66bbd1db2ec39764b4334fbec3838f5bcea3945d22c7a3148c00ab43a67324827af473739d014d7a6a895dbbd58c43ba13cbb1efe SHA512 c6eba75261ffee55cc49e3da71ad3a2f12e04574158975c69db0bbd94d7c22ca4dec50f3140cf0bf9f35bb547865deca3cfd3e28e76c70b9173926bc0b8f34ee
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
-EBUILD sparc-utils-1.9-r4.ebuild 2304 BLAKE2B 16c4932eff08538320f9e624f942a779fcf6c9011922b0deb52b9abf5595f1274a9cec075756cf29ba81c8b0b5b572d13ccf07e46b6ba8865bc50c8090eea7e9 SHA512 8d72473fb064d0a2c2fc5e4334d23f2af904fa9d7ff4c406193d9dd2f45c4728ed696bc842c6a558958623a5bf89109b37ce25ad7d071d16036ce17807390166
 EBUILD sparc-utils-1.9-r5.ebuild 1546 BLAKE2B 5123d5ebf807f9d52f452615f73067592af46a903584a1abd505baa085f29d010e2773c64fdc85c0a5b884742b78b1ccc2d867accf379536092db0d62a60d805 SHA512 90c68e797ce41ec6816b3c0c5e578b7ade6b8799424a3310bee599f6bd4cfab423a0ba70cce51c6eb95b72c0749f2627aff862cdc7cdf6f09d64ad670f8d3cbd
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
deleted file mode 100644
index f19f07a176b4..000000000000
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
-HOMEPAGE="http://packages.debian.org/sparc-utils"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-3.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="virtual/os-headers"
-RDEPEND="|| ( >=sys-apps/util-linux-2.13-r1 sys-apps/setarch )"
-
-S=${WORKDIR}/${P}.orig
-
-# NOTE: If a system has >=sys-kernel/linux-headers-2.6.0, don't build audioctl
-#       as the SPARC sound drivers have been replaced by their ALSA equivalents
-
-pkg_setup() {
-	has_version '>=sys-kernel/linux-headers-2.6.0' && \
-		einfo "Linux 2.6 kernel headers detected, not building audioctl"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${WORKDIR}/${PN}_${PV}-3.diff"
-	sed -i -e 's:#include <linux/elf.h>:#include <elf.h>:' \
-	  ${S}/elftoaout*/elftoaout.c
-}
-
-src_compile() {
-	emake -C elftoaout-2.3 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C src piggyback piggyback64 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C prtconf-1.3 CC="$(tc-getCC)" all || die
-	has_version '>=sys-kernel/linux-headers-2.6.0'  || \
-		emake -C audioctl-1.3 CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	# since the debian/piggyback64.1 manpage is a pointer to the
-	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
-	# debian/piggyback64.1
-
-	cp ${S}/debian/piggyback.1 ${S}/debian/piggyback64.1
-
-	dobin elftoaout-2.3/elftoaout || die
-	dobin src/piggyback || die
-	dobin src/piggyback64 || die
-	dosbin prtconf-1.3/prtconf || die
-	dosbin prtconf-1.3/eeprom || die
-
-	if ! has_version '>=sys-kernel/linux-headers-2.6.0'; then
-		dobin audioctl-1.3/audioctl || die
-		newinitd "${FILESDIR}"/audioctl.init audioctl || die
-		newconfd debian/audioctl.def audioctl || die
-		doman audioctl-1.3/audioctl.1
-	fi
-
-	doman elftoaout-2.3/elftoaout.1
-	doman prtconf-1.3/prtconf.8
-	doman prtconf-1.3/eeprom.8
-	doman debian/piggyback.1
-	doman debian/piggyback64.1
-}
-
-pkg_postinst() {
-	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
-	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
-	ewarn "module (and that the module is loaded)."
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d4778aa44920..7cb4aa17824e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,6 +3,7 @@ AUX 238-0002-core-do-not-free-heap-allocated-strings-8391.patch 1664 BLAKE2B 6a3
 AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688 BLAKE2B 19faeab810419669a6743ebc6a3051b2f5060f6de793a3f7c9c21fce26d395dcad95f6b8aee58fe133d11e2b02e8847d1df4cde30a5dc237f615a8656f823f30 SHA512 075f7d6f20f33f5e0b07ae993853e969e0d54d0a0683302ab1ab7c4047185397f39aaa894cbe4104e75ae65f8944fb5af47e9f8adb1e66c28b152c6d6e863eff
 AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62
 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a
+AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
@@ -14,6 +15,6 @@ DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6
 EBUILD systemd-238-r2.ebuild 13272 BLAKE2B 1f24a5fb90f29640fd52b1c37d67180c733a5fea1a66ae855daaee797b9458bbf42db3fe915b10e0fd90ebfcbfe9cb415fec7d6d4c83cc529e284725b3463cc7 SHA512 537f5053ce876c4b57677768e249be492e1f8b238d96230ddca780ca1ca3785aeda5b61a805703f3efffa7c8e08196fb3022334d2efbb407178440cfae96b451
-EBUILD systemd-238-r3.ebuild 13136 BLAKE2B 6b020f91bd932475f372a372fbc1a20975117dd62ee170252b5056b518a2cfa19a7f8182716c64a63c807de82abaaea2bb8a7aba887fd08f207296eaf497f17c SHA512 866e86d1fb97c0f97a7738374633ba8300e287860554d08702f578a7f516505672f638fdd929757425350a2579670d103ab0ec64f2c3246abde25d1c2e6c468b
+EBUILD systemd-238-r4.ebuild 13174 BLAKE2B 712d300426c0463939f6684a0458aad3abbbbc473fbf830c1ecc2b8d75163cb25b1b97a712c39d4b4fa635863f0fb646a4993e164d8cd9f02abe56a55f6bef90 SHA512 a5894928bc22d1a420d56345dac8f8baaff11b3c308245f90585f6596ef6cc93ba64139c8ab94d6613ca7923bedf85a8bf44638302236fe46b45b14bc40645dc
 EBUILD systemd-9999.ebuild 13186 BLAKE2B 8de75e0c231da02f48ac6a886abc6014ede50b1761ad65e6fcdd3ade2f2cb38bef73bfd4b49f1e35f9b651057b18be886e39ce7d9c09ddbcaea52b7456ff84a4 SHA512 7d2d65b6c37479ebf5997540a35b39125fbb2a050021090c588acd1a38a3b1b09822c59887883b2cdffd518c5a3d4f980193fad23ac5baa6beb736317ea2fbda
 MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
diff --git a/sys-apps/systemd/files/238-nspawn-wait.patch b/sys-apps/systemd/files/238-nspawn-wait.patch
new file mode 100644
index 000000000000..a740e8933453
--- /dev/null
+++ b/sys-apps/systemd/files/238-nspawn-wait.patch
@@ -0,0 +1,83 @@
+From 7511655807e90aa33ea7b71991401a79ec36bb41 Mon Sep 17 00:00:00 2001
+From: Philip Sequeira <phsequei@gmail.com>
+Date: Thu, 5 Apr 2018 14:04:27 +0000
+Subject: [PATCH] nspawn: wait for network namespace creation before interface
+ setup (#8633)
+
+Otherwise, network interfaces can be "moved" into the container's
+namespace while it's still the same as the host namespace, in which case
+e.g. host0 for a veth ends up on the host side instead of inside the
+container.
+
+Regression introduced in 0441378080489e4ab6704cd0a2d78cb1ceaca899.
+
+Fixes #8599.
+---
+ src/nspawn/nspawn.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 810f1247ea2..a5bc50c1f4c 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -2329,6 +2329,9 @@ static int inner_child(
+                 r = unshare(CLONE_NEWNET);
+                 if (r < 0)
+                         return log_error_errno(errno, "Failed to unshare network namespace: %m");
++
++                /* Tell the parent that it can setup network interfaces. */
++                (void) barrier_place(barrier); /* #3 */
+         }
+ 
+         r = mount_sysfs(NULL, arg_mount_settings);
+@@ -2337,7 +2340,7 @@ static int inner_child(
+ 
+         /* Wait until we are cgroup-ified, so that we
+          * can mount the right cgroup path writable */
+-        if (!barrier_place_and_sync(barrier)) { /* #3 */
++        if (!barrier_place_and_sync(barrier)) { /* #4 */
+                 log_error("Parent died too early");
+                 return -ESRCH;
+         }
+@@ -2448,7 +2451,7 @@ static int inner_child(
+         /* Let the parent know that we are ready and
+          * wait until the parent is ready with the
+          * setup, too... */
+-        if (!barrier_place_and_sync(barrier)) { /* #4 */
++        if (!barrier_place_and_sync(barrier)) { /* #5 */
+                 log_error("Parent died too early");
+                 return -ESRCH;
+         }
+@@ -3533,6 +3536,14 @@ static int run(int master,
+ 
+         if (arg_private_network) {
+ 
++                if (!arg_network_namespace_path) {
++                        /* Wait until the child has unshared its network namespace. */
++                        if (!barrier_place_and_sync(&barrier)) { /* #3 */
++                                log_error("Child died too early");
++                                return -ESRCH;
++                        }
++                }
++
+                 r = move_network_interfaces(*pid, arg_network_interfaces);
+                 if (r < 0)
+                         return r;
+@@ -3656,7 +3667,7 @@ static int run(int master,
+          * its setup (including cgroup-ification), and that
+          * the child can now hand over control to the code to
+          * run inside the container. */
+-        (void) barrier_place(&barrier); /* #3 */
++        (void) barrier_place(&barrier); /* #4 */
+ 
+         /* Block SIGCHLD here, before notifying child.
+          * process_pty() will handle it with the other signals. */
+@@ -3684,7 +3695,7 @@ static int run(int master,
+                 return r;
+ 
+         /* Let the child know that we are ready and wait that the child is completely ready now. */
+-        if (!barrier_place_and_sync(&barrier)) { /* #4 */
++        if (!barrier_place_and_sync(&barrier)) { /* #5 */
+                 log_error("Child died too early.");
+                 return -ESRCH;
+         }
diff --git a/sys-apps/systemd/systemd-238-r3.ebuild b/sys-apps/systemd/systemd-238-r4.ebuild
index b68ed0bf92ab..0aca5fbb3029 100644
--- a/sys-apps/systemd/systemd-238-r3.ebuild
+++ b/sys-apps/systemd/systemd-238-r4.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 	PATCHES+=(
 		"${FILESDIR}/238-libmount-include.patch"
 		"${FILESDIR}/238-initctl.patch"
+		"${FILESDIR}/238-nspawn-wait.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index b03addea0006..04d51e7ec34c 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -1,7 +1,5 @@
 AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
 AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
-DIST timer_entropyd-0.2.tgz 8323 BLAKE2B 82c33f9a0ba1a27c86550f13b2729dcfcdf2cedd12c4562866cca9e7d9b1bc8cfbb24c6776ff5ed6a9deb6d592ad6cb310ae3f1cc1f25a146f85a62d0a918e55 SHA512 789f19c2652781593b9ce91c584eab4ef9210bb47f1afb6186311416a67c84235ed1a163ffdc017b6d50ff706bf7ff6a84013b4b31fe6c09eabe95a484805898
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.2.ebuild 975 BLAKE2B 69bda567f330d4bf46aa4ce123920d08b79dd5069ec03f8c6977c8a3548eb396e0b9758076cc2bb1b0a456ffb1f7711d9be307a5084b840f75c62700994b1925 SHA512 b529143760436b945583a8eddd0f4b0b26f772670b5e44f37262c2f13408c4c3997a59adb09f6db083c4a59001e0d1ca21e47a6cbdf5cf261ac821d9f3e7ba28
-EBUILD timer_entropyd-0.3.ebuild 976 BLAKE2B 78f86cfefc8a4b4e782abd03c8c7790bcb83a24189435e0df56cd046df2a1248f8eb932f617cef7c611cd045663c010541ad770818b695d45403a9a12f62d8ac SHA512 b616f766bfacbfc11521bf8a76c560a1b26adc3aed770435ad15344afb24bf82390b0d1c509d3e6d0c1060617acf0b2b7cb64734bd734a0de3bc057ec5b55f63
+EBUILD timer_entropyd-0.3.ebuild 975 BLAKE2B a9cfa6e4fef55f39ca1ffc67857f1fc0acf8ff41c001881a86fa347e91306f5ef533a9352fc4de08a4b494c926c77d9f4b52012a648b5f82894c66b3994920c4 SHA512 483a2d78bfbcfee64f43668af9c1072c90cc8d072b5fdb404dd3429aaff7425c0a4d249aa8412ff394184b24b4ce9a8188b28a30c8938f965d08b9b6e68bcd7d
 MISC metadata.xml 274 BLAKE2B d51bf5510ddf8970e76b90692ad94c469cb31da3aa6b9c76b3de4a6d3643290443ad601307f63b809b7d386c7293ada0be699570b4035f80f74bfbcce58f45b4 SHA512 22599f724e804e72e8db6fcab11ee7495bb5cd3c3a6e25a6424c33bc0ba343859cb88664ecfccb9805c3f35128342aba446f1145edfee5b0a39a92f20a48ad81
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild
deleted file mode 100644
index 2b3bcbaaca69..000000000000
--- a/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A timer-based entropy generator"
-HOMEPAGE="http://www.vanheusden.com/te/"
-SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="debug selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
-
-src_prepare() {
-	sed -i -e 's:-O2::' Makefile || die
-	epatch "${FILESDIR}"/${PN}-0.1-syslog.patch
-}
-
-src_compile() {
-	use debug && append-cppflags -D_DEBUG
-
-	tc-export CC
-	emake DEBUG= || die
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe ${PN}
-	dodoc Changes readme.txt
-	newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN} || die
-}
-
-pkg_postinst() {
-	elog "To start ${PN} at boot do rc-update add ${PN} default"
-	elog "To start ${PN} now do /etc/init.d/${PN} start"
-	elog "To check the amount of entropy, cat /proc/sys/kernel/random/entropy_avail"
-}
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index 0c55fac4e636..9a5835c0363b 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="debug selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 19b4815b39e6..583d2b38c4aa 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,6 +6,7 @@ DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37d
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
 EBUILD util-linux-2.30.2-r1.ebuild 6505 BLAKE2B c1d22b2567a811b2b4727eca13ed9974eb115f0e1bad9a0cc096b96afdcedeef013480aa7d5832b93c94b1a885be0edfceb3eb80d693b6f09d10a37d0e9113a8 SHA512 d27ea0f42a066dfdc1c5c5bfa5af3fb50e5f7b04b27a692cd810316143c942f3befd18e1d83880e5cf56b3505d0c265b751c570ef947f568fb417bb92e0c6c60
 EBUILD util-linux-2.31.1-r1.ebuild 6542 BLAKE2B 7fe9468885f684c1300f731a3c9bfbd3b55b6fe68e7d9eaeb90145e74ae70ca4fa06208f6d2a2d3a3dc86beddbdee972bc34099e077c24f98920a236fb07a352 SHA512 c71aa0e58861fb36f186ee6d9e65ad889b6a0339ae6c1544c9def001331739dff4e7950dd7c70565531e28acbb81862392f1c369081b18489a13cc026b2d4a90
+EBUILD util-linux-2.32-r1.ebuild 6692 BLAKE2B 397c5ecd815ed00c1e48a6181ada040acc7dd94a32a75e6e86f66be32d62d663b79fa7e60c024657666b2970cae1b6b01c071a9ed5d05087b720159b09a9c328 SHA512 b109407397db51cbc2e0d4cfb954c7733e9d40d2b4fbcec805bd9595379e8b49f997cbc42776b6d5a31b4204b01cd0000cfb16d462d0c29dc3e636ad1943ed82
 EBUILD util-linux-2.32.ebuild 6469 BLAKE2B 6c84dfecb250b52372b56ba381efaa419f4a896476a3da5642cba7b5d1b10c1acc298aaccc12e35ab2d0345437c91ee49b65240e8abbf8bad0c3cb2d0785c733 SHA512 7dae1d9371295d2f2a415927afe945b7a9ba1e893e33a7fd63b560ff4d619ed706280e644572a1828bab6df76084e7b31d868cea26d06acf6aa2ca9f7e995cfa
-EBUILD util-linux-9999.ebuild 6436 BLAKE2B e239ea519099ac597dcd2d05135afd4adb310d57ac035367b86ffc269472bc79b858235b5120cadc5f49cfb7018e068206b8cc19a445b471a3cc42cb38a9928c SHA512 af57f409ddc524fe2b5dd965246ed6fde2b132ada32b2187214f45f24fb18dd91b4301847928c60965bac56da98fb9a37c61422559d4e923548531f8bf326a4e
+EBUILD util-linux-9999.ebuild 6680 BLAKE2B 2ed2f44ba3f5eef5e2d09d41f7d8f63b364f531fb55a7e8e065d687728fca6f8443201a62a7f2f82a95f8faf329e706eb0397abb140c01ec8b46e8fa66a08092 SHA512 8fc29a9e99ec8bbfb983967ea5a6c35c82b97e5c478e555ac719cee41e4dab717049e9d8a3e375db510cbf712ddbfd5cd6d2140c27cb1cb380698fe8251d5dd8
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.32-r1.ebuild b/sys-apps/util-linux/util-linux-2.32-r1.ebuild
new file mode 100644
index 000000000000..6d113163470f
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-single-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	local myeconfargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		$(multilib_native_use_enable nls)
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(usex ncurses '' '--without-tinfo')
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid mount smartcols uuid
+
+		use python && python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6fcbc94b0787..76ee8160737a 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -73,6 +73,13 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -110,31 +117,11 @@ multilib_src_configure() {
 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 
 	local myeconfargs=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
 		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
 		$(multilib_native_use_enable nls)
 		$(multilib_native_use_enable suid makeinstall-chown)
 		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
 		$(multilib_native_use_with python)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
@@ -144,39 +131,63 @@ multilib_src_configure() {
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
 		$(tc-has-tls || echo --disable-tls)
 		$(use_enable unicode widechar)
-		$(use_enable kill)
 		$(use_enable static-libs static)
 		$(use_with selinux)
 		$(usex ncurses '' '--without-tinfo')
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
 	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
 	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
 }
 
 multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
+	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi && use userland_GNU; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid mount smartcols uuid
 
@@ -190,6 +201,12 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+	fi
+
 	if use pam; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index b5376870098a..296906f02f2e 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 9818429178ba..0d67da8df191 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -5,6 +5,6 @@ DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866
 DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
 DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
-EBUILD mbuffer-20171011.ebuild 1422 BLAKE2B 8d57719fc5b13f8df59bb55f01a8048ce8c6a3488985efcb2e3a5e645f5e0d7785e6cbf445171494f66864f956490ce99d02113972c07feea4e074336b158266 SHA512 82e27724e3d22cd0f93477c81e754f0f57b3f4f91323bf35c3c4c4d47ab92ffba6d09b1ae3709df514ad5714a5b2f7774c803ee884cd2368530e530974eeb77e
+EBUILD mbuffer-20171011.ebuild 1421 BLAKE2B 61fac7b2c67a2a5f20509b1fa0a4035cb548b122115a31fdb88e0078e6431ef724d075063aefb1d467ab7d9607efe245fbe6d2077a72b771000c8ce222225549 SHA512 cd11b2784ffea0db7a488a20820b001ec3583b4ab8a80b5314e82ccdffb04b6c03976b5f40491c7e7f2903ddf8c7b6de9a695f3d1a432ec7e8dfca9f83e8de93
 EBUILD mbuffer-20180318.ebuild 1422 BLAKE2B 7743ea686f29752e4168b3932ceadd3393b5334b550121848c4b65196a005f270a90013bbe69596d623959930c77e4e625178382eb878c1d7bf49663fe0a9422 SHA512 c7e2e07b7130a13dea4080303024ba4f127d6b63f62c882d5073b602b942fc07991f27eb73afe7e35fe79b91ddd3115b9a58c94d5dee3535a014e0af0fc2fe6c
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
index b7d5ef07646a..8ecc65f5759e 100644
--- a/sys-block/mbuffer/mbuffer-20171011.ebuild
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug ssl test"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d1fa5b0a06f6..934baa7aa1c0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 0584bbb1f332..f959925068de 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -17,6 +17,7 @@ EBUILD binutils-2.26.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.27-r1.ebuild 293 BLAKE2B 750c39e7ba698916b54eadd97e36fa8b84c9aaa547bcd671deaff719e9d95e66265a12c7845ea7a98de4337263230ac69f0f634c29a6bead78fa13820dca280f SHA512 4137e36156afbfd4ddc6ba08b6fc94e37556375c42f77e21d72d8338e55af094ef28bcbdfcf2c686232b5932208562f38b64db8638d2199ecfc2465518544267
 EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bddc950a6b103036e3b8dff1933f9b8d803fe2c85b1497119ee1fb6358c08234cf44eb5a57a43061c815fbd510080 SHA512 322c2cbc01135c2c22afeeeef1a6147e9c896432ee81cee131965013e67d569f49e4017e76d9fec90a00175fd4af2cf0fd3e00ef1e76157f85506e5d33e3035d
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
+EBUILD binutils-2.30-r1.ebuild 11829 BLAKE2B ad60e93099fe94c11dfe4f25fc719256896649eccc30e586b2df2a7f30c2eb64e36a0d693d9916ec79ba99fe40a03c3ed330da4183bb0721817ea151d92df7a2 SHA512 91c0d96611bfff8f79820849a98547716236f96f1aa45f4c861f3aa466f6e3c51eeeac219ba4e851d337dbf97dafb007e54d9403d63064840624d5947fb27859
 EBUILD binutils-2.30.ebuild 10534 BLAKE2B a2fc2c0f281338402e6603cec7e53cd9760faf2966fa9c8223f2840ed6b7fb9590a829b4d1c218be3fde12e2835bb5d38a0f4f950da4087a385ae748b6592cc8 SHA512 4e58b473af1c16d605d7aed56baa84cd6c83835bb4ba2ed91990c78e7dbd4fb1584a415cfa7807da7a7bbdb725b717908e023711f47119735c9ab5b7343578e9
-EBUILD binutils-9999.ebuild 10335 BLAKE2B 576d8aa44e86a6ec442908d0e0d85b9e28808febcef399148183e026c75ee3082d7457eee734f2cf83331da6b9a0860aec5ff9a796b1d8aa13b4aed09f43a885 SHA512 398758514207ffce6c0c3d8fa1c0ec34465fa72c20d1ed572a4911e88ac79b05a679e15727346fabe4b84c96d9f6f555d70db7f75fa501a0c3492cd21af6d71d
+EBUILD binutils-9999.ebuild 11630 BLAKE2B 3fa2f747f6a8132c3e09f41d1dc5728f471f264ffc273c1e00fdd1a4892b76c668e1511c16adfdad74c3ed2dee61302903d54d9f91567bb29b7e875cfeaa3d14 SHA512 b802b3ee0d6eb9770d6611bfbccf860debb97179e33468024037062351359c5a8d9adf86f11da7ddc4ca48dff49ee9243d5a369d67dc40a15b1d2100be587776
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.30-r1.ebuild b/sys-devel/binutils/binutils-2.30-r1.ebuild
new file mode 100644
index 000000000000..145bbe7e2907
--- /dev/null
+++ b/sys-devel/binutils/binutils-2.30-r1.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="+cxx doc multitarget +nls static-libs test"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+#                      Default: dilfridge :)
+
+PATCH_VER=1
+
+case ${PV} in
+	9999)
+		BVER="git"
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		;;
+	*)
+		BVER=${PV}
+		SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${BVER}.tar.xz"
+		;;
+esac
+SLOT="${BVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+if is_cross ; then
+	# The build assumes the host has libiberty and such when cross-compiling
+	# its build tools.  We should probably make binutils itself build a local
+	# copy to use, but until then, be lazy.
+	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
+fi
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	case ${PV} in
+		9999)
+			git-r3_src_unpack;
+			;;
+		*)
+			default
+			;;
+	esac
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${BVER}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${BVER}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use cxx ; then
+		myconf+=( --enable-gold )
+		myconf+=( --enable-plugins )
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${BVER} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}" || die
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${BVER}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${BVER}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			env -i ROOT="${ROOT}" binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
+		binutils-config ${CTARGET}-${BVER}
+	fi
+}
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. But many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not ./configure to tweak evey location we need
+# for slotting binutils. This note is about SCRIPTDIR define.
+#
+# SCRIPDIR defines 'ldscripts/' directory location. SCRIPDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index f0c8730c8197..1c3f3623a947 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -146,10 +146,11 @@ src_configure() {
 	INCPATH=${LIBPATH}/include
 	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
 	if is_cross ; then
-		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
 	else
-		BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
+		TOOLPATH=/usr/${CTARGET}
 	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${BVER}
 
 	# Make sure we filter $LINGUAS so that only ones that
 	# actually work make it through #42033
@@ -251,7 +252,8 @@ src_configure() {
 
 src_compile() {
 	cd "${MY_BUILDDIR}"
-	emake all
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
@@ -272,6 +274,7 @@ src_install() {
 	local x d
 
 	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
 	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
 	rm -rf "${ED}"/${LIBPATH}/bin
 	use static-libs || find "${ED}" -name '*.la' -delete
@@ -380,3 +383,30 @@ pkg_postrm() {
 		binutils-config ${CTARGET}-${BVER}
 	fi
 }
+
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. But many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not ./configure to tweak evey location we need
+# for slotting binutils. This note is about SCRIPTDIR define.
+#
+# SCRIPDIR defines 'ldscripts/' directory location. SCRIPDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
diff --git a/sys-devel/boost-m4/Manifest b/sys-devel/boost-m4/Manifest
index 4f94a241d64d..e8afc889cbc0 100644
--- a/sys-devel/boost-m4/Manifest
+++ b/sys-devel/boost-m4/Manifest
@@ -3,5 +3,5 @@ DIST boost-m4-0.4.tar.gz 38871 BLAKE2B 95475d8109f13b420ee5ac95588e5756b17e923ef
 DIST boost-m4-0.4_p20160328.tar.gz 41253 BLAKE2B 47ad17f652560dce4e276b295e55e7daa8752f1c932a6c0d1bad9e4bc2ff72eb0adfaf8abc4e7c57f179f08857de255935fc530f0a4d8a26d3f6a2a0711417ac SHA512 4aecd311b21ced4a3d62fc706a9fa731c375ea490482f78756892243b5af6909cd8841c249632b37820be7f1bde41c290e842edd933d0c727e1dca76d30eb506
 EBUILD boost-m4-0.4-r1.ebuild 917 BLAKE2B c32b670293a9b5b5bd949c71c35d6bae28581db8aef36afd4532e8c7f92fe9beb58a84496e2bcc17c884ad46e3c1b8e5468579947e1008c0393e211ce4849d61 SHA512 d6fa04dca6ce327db4189f03e8e7a7239e69c1f16b9c5a91a7b8020b1dc970ea8393daa2c8dbab1f11d433e63d11858f96bc5790334f65e4260696198b0912d8
 EBUILD boost-m4-0.4.ebuild 844 BLAKE2B 5d1ab04c297ef3f76665ccf1e18a66a5018945287a7acc0874b2a32b764db1770f39cae4f814cddc2e008e13821884134d4414d0ef8838f761b5b88d6af73a11 SHA512 896b5628af4a1934c25543d564a2266bdf7afc0653ec93de84155d16b905aeaede4e4877b0dd3afde6a6bacbce266c8247a2cde9cc8f1662af53878b478161d0
-EBUILD boost-m4-0.4_p20160328.ebuild 907 BLAKE2B e08fcd2cbb5d69db9952d9dccd31c211861a43e905224afac9cfef65aaee6032c165077e44c6edbe348a2ec27e7e3ef17655c972e61015d41b21f64a9c905e41 SHA512 e1c1ed673bc9a527e20c28d8b0d6ae5ef6ccba92357aacef155023deaef3ee2aceb5e4dfc376ccf42041a47707f5a8f94ddeb3fd121d422cda4f64f43652c23f
+EBUILD boost-m4-0.4_p20160328.ebuild 906 BLAKE2B 86bada0f35bc7cafb53e15d9367eff8c9a737bb078bdf40d5406e0a3fb987eaf411956bd4364c1a5b25f5970fe58ad0c611d2c468ce0cfbccc1f5033ee6b6b8b SHA512 4384aba089115f27f7553ab6da59b819d644dc85f1895ee645ecdf2a304d464a4fa064a56d66016a4b22151c4f5efd4101b60707321f25c33cf50acf85cc5b4f
 MISC metadata.xml 222 BLAKE2B 448a1ea951952548a4400942106647671f29fd652f7cfb1c37fe9560e77f169f9ba9b68967736b542d134c111924cd0e2d84dc4db6269690234b6f0b50cac630 SHA512 5144b4eb888e33db8ccf9038a19bebaca24c0ad51a04e706f1701214adab830a39907686b4c4d655f147b827c34dc2fda9737680ee983da5f62b417ec0775557
diff --git a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
index 9cf5959f1eeb..2a6a29b45a13 100644
--- a/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
+++ b/sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}/boost.m4-1489691f65aecb593e33abc3e56ac482dd67da7b"
 
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index f472b475794a..cd1e807ff288 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 03ef4c08acc0..6edc7a555567 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -6,6 +6,8 @@ AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf
 AUX freebsd-mk-defs-9.1-gentoo.patch 11769 BLAKE2B 5a6f3ce6c84049cb876db85e69e7428a66473de2244ee299a0e6abf921fd7c4d0c4e412fd73e44581fa168ed635f49bac36bd4f73f94113b22c9bb02259a8705 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe
 AUX freebsd-mk-defs-9.1-gnu.patch 2273 BLAKE2B c74563cbf039bbb3377bbea7e47affe540d756a0ef15ddfca60cf7f889b51b943cbad01bc0fc9ce1fb7783777a8bba1b5b1d82cfe6079bfb30dde6e9dc1e5491 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd
 AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 BLAKE2B 2093435dece5cfc8dbbcd1035ee4930c7b30d35b5450f7548c3fa9e34e6ac451731cd4f93c8acd3ba045150ba5674ea557ed7c1e8c79fa2fef1d3627c44afac5 SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913
+DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 EBUILD freebsd-mk-defs-11.1.ebuild 1136 BLAKE2B ffd94b408344303a33c949098cb8bf7084255cfe8adaf4f3bfb5d31a0907c37fb05596f955dd21ac0012c84a836c16267608b5083b343f187f16f1b622e4f4bb SHA512 645fff46a41d3c00ffb966139d58f2e46a6bedabbd163692300fa46bd7cf956d75dd5a7a41b733f7a6eb7743a2049de038a2c9484671a1a0d861dd2bab34b544
+EBUILD freebsd-mk-defs-9.1.ebuild 759 BLAKE2B 721eea8dc09489884a041dd928d3a8de46b46890c9eb2f56614389e8ffb730d4a74045f322f323048302b8fdb53a638c12c5b942715dec706f0bdbd193867532 SHA512 74bfeae62f5efdbdd15631826fa1c89f025bbebe9f3e063616948cbde28e4de9faa66cf35db265efd6da88e05a00a62cf325cbb013b23238bd5c6a7f38c7ca34
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
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
new file mode 100644
index 000000000000..b98cde16cb2e
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit bsdmk freebsd
+
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="userland_GNU"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share/mk"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
+	use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-gnu.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+	if [[ ${CHOST} != *-freebsd* ]]; then
+		insinto /usr/share/mk/freebsd
+	else
+		insinto /usr/share/mk
+	fi
+	doins *.mk *.awk
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 059a1c13da72..10a636ef6204 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 77695747c360..a4ca0a854048 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -5,7 +5,7 @@ DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
-DIST btrfs-progs-v4.16-rc1.tar.xz 1979224 BLAKE2B ba14c80b987afc7ddba41dc78c0d54ef7fcf23baf2adb1104ccfe188c38bc960db5d76c39de961fdb30f1af2b9de48644ab68b16f905bed9835f48b2f873b9e1 SHA512 e8bc0aebe36fba02b61dcb7d42c463ac2184d4097c8232a52d0e6c9ffe41700d8366b28ee14082d47a7489c1def309dd208a180059897b63f525229bc1e5284a
+DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 EBUILD btrfs-progs-3.16.2.ebuild 1257 BLAKE2B b243da6fc07eb44afbb5c4db272ba98c88a27f27afaf7740e2105c143fbc5ac7f6894c66feb931229a1da4eb5b7613418240ee1a051ebedf79d53d4b0e260fc5 SHA512 2321b579af3ee75282836090bc1c0fa71e2f80fa039a479ea71755674f09cacc18e269430e1617e4b1dadd2a9a80b6155cfd0cf2231b6f3ef6fd58f03934caf2
@@ -14,7 +14,7 @@ EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859f
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
-EBUILD btrfs-progs-4.16_rc1.ebuild 2522 BLAKE2B e837b8da7893edbe50e9de208b0f0270d326fd4e572111928dcfe5f842083d7dfa4a0351b2f10463a133c971fd28f0d88c2952e691dcab4f10a882f9d0cc5ef4 SHA512 9c60d81ffcb0b44ad8168d93c16b3b5216cfd4208ca9009b395e9938acb36eb0aca99894ac75e6c77a1059b71bce4930f11d337abce8ebf5b3ceb192b5de44dc
+EBUILD btrfs-progs-4.16.ebuild 2522 BLAKE2B e837b8da7893edbe50e9de208b0f0270d326fd4e572111928dcfe5f842083d7dfa4a0351b2f10463a133c971fd28f0d88c2952e691dcab4f10a882f9d0cc5ef4 SHA512 9c60d81ffcb0b44ad8168d93c16b3b5216cfd4208ca9009b395e9938acb36eb0aca99894ac75e6c77a1059b71bce4930f11d337abce8ebf5b3ceb192b5de44dc
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-9999.ebuild 2515 BLAKE2B 1ea8bdd9f1162533c673c95f251b214260f1bbea58c806803cdf0795e688d624774705765745b63cae047a7f89539e42e10fae7c58b34b35ebeb187c97734477 SHA512 ef7f69cf25c524e26aba8cf2e0889c623faf3aa6dd88a8cf2f944756c52918b825570e6f92581ea8343fb96db0c565541855409afef6e3bed056cf397089276e
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16_rc1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
index 1a8e2474dfbe..1a8e2474dfbe 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16_rc1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.16.ebuild
diff --git a/sys-fs/ext4magic/Manifest b/sys-fs/ext4magic/Manifest
index 9422abd51988..2257b26f5ef8 100644
--- a/sys-fs/ext4magic/Manifest
+++ b/sys-fs/ext4magic/Manifest
@@ -3,4 +3,4 @@ AUX ext4magic-0.3.2-sysmacros.patch 291 BLAKE2B ef3e5d23d4438a72f090e776cf0a6019
 DIST ext4magic-0.3.2.tar.gz 426941 BLAKE2B 7123af6a928e606980efba85e4c4b1f9284776176c4d5a2f978a4fb1639f68ebe3fccc07c972baeee661b2d26940b8dd252024b515e26bad7ed8635434288dfc SHA512 81bc9ba40dc2ea0bfb01bec160a1bbf0bf8a7983241aba34190d3571386f4d7dc63409866737b8d64516a3594eba11c819bbb721a1942c0a675d5675a7bba9a1
 EBUILD ext4magic-0.3.2-r1.ebuild 952 BLAKE2B 604d6f10995243824676cd41235892d5685ff331b7ccfc2e5be41f0f1b25542f5c7493c614f7c26ed9f19661e5558ea7b3c10e7ebf6deb861fcc5d190056d992 SHA512 1691fbcd56f71d49470f0d75e48fe28917b3cd71a4ed377930c5f9805267af99af0f9783f54077a920970446d678628dae05d26cf31ee4274a2779cfad923d71
 EBUILD ext4magic-0.3.2.ebuild 936 BLAKE2B 404e84d0c5b352d616baf45efe49790853e6e69eb6b5764c566efd11e4afb57811c392b6c8977e9b15ad9adfc40a9b1cd21f89ea423665ebaeff5c6d51595d85 SHA512 9abc859a05886a67890585fa8f5b68f3e086f0855bcd78fb9b0340c1917ba356e04d7a5d2175a29889a10fc2fd1dbad66283ab9f1012a07a02ef21a8d5e698a2
-MISC metadata.xml 686 BLAKE2B 1765b0a3550faa934493725aeb42207d1a0f3cfb7bc2c949ea8a0a704188694a3377ff0debe6449c34f4aba8614183b6b2e9f83cd911da672efea9b3fb30481b SHA512 1b525595caa1d1b839dbb3ae96b62449f6f141fdde8ad3a0d30df95d5cc8e23c2b0e645e3d91434ae7861c30852f96619d11be4c439f156ab56cbd1876ad633d
+MISC metadata.xml 578 BLAKE2B 013c3bf315840c8f0092fc3bf66386c4d346e9336a6aec25f61b484033f499d18c85b9709539bb59f191d8795b979652ccd5da7afaecd00eac3b4c21ce6c59a7 SHA512 dfa7d3d90ff9c68338e0c1ac72add7613e450317a60ea5db8776e8bc489a03e9cc1f1451ce67a1bf0fead31f401d3b7b93c76208012f3bae56e20516b36017f8
diff --git a/sys-fs/ext4magic/metadata.xml b/sys-fs/ext4magic/metadata.xml
index 4f2ff8681bf7..1c14353a5c56 100644
--- a/sys-fs/ext4magic/metadata.xml
+++ b/sys-fs/ext4magic/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gokturk@gentoo.org</email>
 		<name>Göktürk Yüksek</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
 	<use>
 		<flag name="expert-mode">Builds ext4magic with expert mode. Highly useful in recovering data from a corrupted filesystem</flag>
 		<flag name="file-attr">Enable the recovery of file attributes (append, immutable, nodump etc)</flag>
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 51c508129592..5863e5e3305b 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,5 +1,7 @@
 AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
+DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
 EBUILD fuse-common-3.2.1.ebuild 1398 BLAKE2B 6948cf83261c2e47891b0990ecd6dc080d1a6a50a57c3fead02edfd68b54f260b458821be37beacf64d72d8fa318713c14bfbaeb580699d17e447e37f8895e72 SHA512 769b9ab430a4a62b25991c5f4cdf4facbdf974530a830d926405695fe7e8ca030f13347e98d46fc45d7795d6a3896befad55dd391719d5d4a9357dfeb3b4f109
+EBUILD fuse-common-3.2.2.ebuild 1149 BLAKE2B 386f4a10b3ed57cbb0c1ec9a3bfe773892491241edf131baaa4665a029994b4c409b2a44e2f814d728f463b7edd78b9603ed5181389893dd085122bbe7c7aa2c SHA512 d223b27843e28f4fe3a45d6b8d7d4cdb8c689427a0d0b2c695a599fc2bbf8da43cd0ae0b4f9e0748de676712c62b411fab274770f5a25547a0ec735b823d664f
 MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae
diff --git a/sys-fs/fuse-common/fuse-common-3.2.2.ebuild b/sys-fs/fuse-common/fuse-common-3.2.2.ebuild
new file mode 100644
index 000000000000..574c6ffdefaa
--- /dev/null
+++ b/sys-fs/fuse-common/fuse-common-3.2.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson udev flag-o-matic
+
+DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
+
+S=${WORKDIR}/fuse-${PV}
+
+# tests run in sys-fs/fuse
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags -flto*
+}
+
+src_install() {
+	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
+	doman doc/mount.fuse.8
+
+	udev_newrules util/udev.rules 99-fuse.rules
+
+	if use kernel_linux ; then
+		newinitd "${FILESDIR}"/fuse.init fuse
+	elif use kernel_FreeBSD ; then
+		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
+	else
+		die "We don't know what init code install for your kernel, please file a bug."
+	fi
+
+	insinto /etc
+	doins util/fuse.conf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 76b8c1e592d7..0edbb41f28ba 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,7 +3,9 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-2.9.7.tar.gz 661138 BLAKE2B 8e56cfa8634e919bfc4f9fa589074763bd8c272d5166a2a6fd7d416477ca07a374611639283593df4b06f8d5820b8cf5a375463d4b85fa3644868b2a62611003 SHA512 f47304d9c7a1815f7a2905b7bdb7785d4c10292a80c8dc1ec45d895af96bc6ffd6d84ff2617bd976a1d0867ab8ec1a404a5a05ace85a69ecca830f371d08f8e2
 DIST fuse-3.2.1.tar.xz 1042772 BLAKE2B fe7dccc3b791a3b549815f5015a993c29d9481742a88b0291a03b39b95c0acb709969bdc0f6fbea5a48d0bb97bc362ad351b719d77a4f9f630825308f3fb1913 SHA512 edf08711fa02c40b9d3507c99e0b1bfd7208edc1494888c4e2bad92b621eb5c43c4cb31474d2d3bb1edaaf9cd876f3407cdb00a1bdcf61a0b74c876d3707518e
+DIST fuse-3.2.2.tar.xz 1187816 BLAKE2B 4cda342ded747a92f31417c32006e202398555d2112134f403addd1f2ef896ed46e1082a13437e657795ae93b67fb2692746b759b9efb3bd8c70857623ca1af6 SHA512 234256ed8e9e277557775d34b0aa77f3b0a3c40a715e52db1437f2ffd2a7d8eda2e12ef35963a918b3310f7244bba9b3755003a25b98ea6d29b6d4b322cddec7
 EBUILD fuse-2.9.7-r1.ebuild 1967 BLAKE2B c520b94126a010188fbe36391efff49287b41216996bc51179fc33bcbcd1830fad0178d1e62cc568460963512cbd5bb0817648bca39d4934748114fd013a9612 SHA512 16beaf9cbef8060d07f26017adab1364731a75870993d87ab807bb3f6f8023e7d62a3e2ed0c8d540d2350353c0555de8590f9ac2eb1bce3078d161a558b2a1d6
 EBUILD fuse-2.9.7.ebuild 2217 BLAKE2B a132222d50317eeac24b49a92e2f381c5f6475e2b89fa5d92823363c726329a0b70de4595b07ea1abf32a3ef95d068ac58b5e18e4d8d86554f9dba407e4d879d SHA512 40735712f825b32f9db1078d78549be073db57329ffc243ef0cd46b8faf06fcb7961143d2779a8bc1ea8cdbfc0328110d9cc460f93e3eed8f51a58894d12287c
 EBUILD fuse-3.2.1.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
+EBUILD fuse-3.2.2.ebuild 1652 BLAKE2B 6678f6541c55f65d2fd821fac6451370be6e339b97216e723c75055e5ffddd2c394e906b95452c201a305a84f01373ffce5715e5b82dbeaa7f88b642e7af8b3b SHA512 5022ff659e451f6c1a391e5553075bd706dbd214822c090d3caf7c353fdaaf93663fbe2c3650e4a0a25e0ee27c92c6a4292a52c8d345b328f13ce473fb7478e8
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-3.2.2.ebuild b/sys-fs/fuse/fuse-3.2.2.ebuild
new file mode 100644
index 000000000000..4012fc673b62
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.2.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND="sys-fs/fuse-common"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags -flto*
+
+	# passthough_ll is broken on systems with 32-bit pointers
+	cat /dev/null > example/meson.build || die
+}
+
+multilib_src_configure() {
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
+	rm "${ED%/}"/usr/sbin/mount.fuse3 || die
+
+	# handled by the device manager
+	rm -r "${ED%/}"/dev || die
+
+	# manually install man pages
+	rm -r "${ED%/}"/usr/share/man || die
+	doman doc/fusermount3.1
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index efc264ee765a..eb79263e1c8f 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 3b4666c4d697..1f372c16731c 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -4,12 +4,14 @@ DIST gentoo-headers-3.18-1.tar.xz 3628 BLAKE2B 9e677389139e8e3e42508171593797b78
 DIST gentoo-headers-4.13-1.tar.xz 4096 BLAKE2B a0506c6aec14d8d710863cc3f7b5ce6cc067af245cc96dbf83f10f02ba83d580f900c9cf8b09b496370d580a9b9cd935738d8b4b0cb987836490894fba01cf23 SHA512 14236185c8810b88d94ff0533fe59e84599c2d4e5c7507c37cb458b6728eed69b581df7f8654d5323454ec359e93490c4dcbbb1ee58a66f2586047c93f0f1aa6
 DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
 DIST gentoo-headers-4.15-1.tar.xz 4068 BLAKE2B fc99b99637a11dc0cc6b4d79be3e32242f4b4f3c86a4618b3a51839e902ebad045b335f531ca41c10a6a597111f2cf77a0ae17518fb17a8441b26f1bd98c19e7 SHA512 cb973625381ac0115344d9aa1ddd927d75f0c11961526844a9da6a0aebcd28b488a7af3b423ac8358808d998d9d00d51156780905a04c01c6c512215cad6de7d
+DIST gentoo-headers-4.16-1.tar.xz 4044 BLAKE2B c35efb14266d7d7f06de79f584c6e13a700c38793d7df399e668d5de269088d8a441a10e9d0b7acc5b6d1a116343d516aba58a4823cf51845fe9913dea81cb76 SHA512 a1fdf775bc27e5db2ccf1f86f12e78a25a4127673eb0a87639d548dc6246b81e5df0e8d56c0314ba833fe82d2825f8620addd408782e2f5152fb0b056b870d7c
 DIST gentoo-headers-4.4-1.tar.xz 6624 BLAKE2B 9cdf0c22520e413f175942c4994dd90b0fed8f72c67332a05e7ed72b901ee04594f4e4a3c0252e0a6e057d9c08c4d653387dc36cda82ce9ef8a16e7317ba9ea0 SHA512 dd8a5c627a9cd373022d7afa1beb126f15694f80452821f31fc5c1a3439635814d205bcbc873a5869946472d86cdec872a44f4870751b96d42e89893fca1b983
 DIST gentoo-headers-4.9-1.tar.xz 5416 BLAKE2B 2538870b340d4e4b260ada37b0571ba770a4bf93b0f0cf78819b4bf68b8ddc43c314d7fc5d12a78bc71c9bb12306d986ae0ae74159ec7edc7deea371f6b5f015 SHA512 1069f50c58f25ceb8a13c8e53dce6a21e352e2a624da3b9a6d139939e7613e9a97226eb0173fa060ee69443c6a50b53b6d5c6d752dcaebffbe2a78f06cfbe2b6
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
 DIST gentoo-headers-base-4.13.tar.xz 7951980 BLAKE2B 8b3b5d9152455b08bf06c275a69168f8a2418584058e23f784d3ab956d72b100b89d398bfeb351d8faa8285cd9ae8942726099ce9aa3fd94b8e0e92b8de1c217 SHA512 3b528e18199d43db3f51c8fb9a5a4c67b9317ea7e9b9fd82fe2cb4d704bbc1253f2af64dc79377ee8ec26511d0893409e3dddbb9a6ae11e8bb7f4ca4d8d3ac9a
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
 DIST gentoo-headers-base-4.15.tar.xz 8199628 BLAKE2B 79a4f694a8335ed4bf1df94ab7829f41d3476165d0ce822a13e47461d7e3ee4cdb5e88acb9960a92ba1142adeb9951c19e17405c37b80d461b8577c7d1dfa37a SHA512 7698ae90e356cb6105d3b1fc5351264774428b5caa405e8695925965ab2ff3a08c0dfe3587a69a87405ecc45c6cd3040c3a9f751d6e6dc8eddf8b28ded4e2584
+DIST gentoo-headers-base-4.16.tar.xz 8222256 BLAKE2B a5065cb49b549ea5eff33bc3a60ed070511cc463258666c30681aceaba97a108be059e4fc175bd6ba4dd0b27cf8bab14e0a8225346811eaacb4ddf8b2ba5a147 SHA512 2a5beadc61532d23f999c24101f3ab6db5d184a7327fa26330e318ac6b5b38b14c0e73ead2f550707b4e24c1f4f1a11c306c97608d98d530978fdeb43b4d58d9
 DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6a62cc36c076bab193ec397fc0d543170f29c6d5a0827a2ea5517eb68fc838819cbe3e5abd125bb920992492369d5e5c1e7cb SHA512 1cd3de58ff790c3730bea38138c7a45ef95d04288c69ffeabebb884fab3add13bd9c99785ddd87a3ee467a0e1b1cdc457bbd28da349e7c178b4d2374c5fb78a3
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 DIST linux-2.4.33.tar.xz 25725956 BLAKE2B e6740cdf4731bdacbbf952c5d14b4576c1cf6880a4cee6c7c1ed27e54f3499234d9a787d16760f86ba48216b9aedf5456d475ef886175f8fb215c44b099e6d2f SHA512 cc5b6ba5824471a81b80e973378a706882b10951ff4ff6c888e849fb5efff88cce20d2265ba5c8161605cbf87d1759851f9e4703720dd0ac339ec129985d4b0e
@@ -21,6 +23,7 @@ EBUILD linux-headers-3.18.ebuild 1444 BLAKE2B 420273f8046f2f94c43503d6674241636a
 EBUILD linux-headers-4.13.ebuild 1518 BLAKE2B 81bb4a6c26d3d4d0003565e5d42410e0028893b47f0e8352a31760ffb803526b7468cbad2b9125a20c9251df89d40ada97155d7e33278755bf042c8049f499b4 SHA512 4d703c7cd1d645f78560a1710bf2519fdf192930d9d1ef37318700b702cf150b3352de466be4f076f02af8e8e54269d8ca0e0a86d0b52447e372fb3dbf4a2314
 EBUILD linux-headers-4.14.ebuild 1539 BLAKE2B 8900db7ba2982d602920c18fdbc34340d624eb18d1477a59426170f8c5d82d88aaca5b1132a6211fe52dd635fe18d06c294d1e93e901bb6fde702ce83a229520 SHA512 412b3b9d932373fa4e3643d7cb14b96972d3fada2991f1150816365a0989fe6d802975882329afd6039809bfa49863a4e3043e596a4f1ff32e18fc7d5ba5bd6f
 EBUILD linux-headers-4.15.ebuild 1547 BLAKE2B 1fe60dd5ac92ba993f0f8fab74d964f04692b62591ce24e7baa9fb07ca7ffe90b6e285a2232540ec603bd78ca2f3d30541f3709014439a7e664ada330ac3e62f SHA512 ef9ce5b8e639a5eb89fb3a4bd27f0112ace2a9542dd7eff459f8139a764c7b01ca3afba5c5ae0eb9b011fa7a0f366bc31dc1a4b3286d34c92a2c86b1aecc06e1
+EBUILD linux-headers-4.16.ebuild 1767 BLAKE2B a47fea57080c47529d0a168ac70998850c8698f3840538ce434c17da935ea2ea7fdfa0992855fae69424517882f4f39198803d26477c701c67db95581455ea69 SHA512 0114a8f53d7bfa87412871ad53ab37beb0f4a68ea631f9dcbf89f50296c111d6d5e5d370b5dedb44985f5e96a86417e396c8050b324cfe4c7554417af7805cfc
 EBUILD linux-headers-4.4.ebuild 1518 BLAKE2B 7aa19afb813093a903a3de6ac6176470baa3fcac408bfaae4adfb49d676b74f022bcf08ad719184dde1b947e6bd32246af220e9b30649556ded38b58c0833a62 SHA512 f4476f0cd952626fecdf8d13b28f33ad44bc9839d0918306af9dff1a97a65eee730421c906df5ea1f77be143be5deefbd23c985b135b330c15dc3188383015e0
 EBUILD linux-headers-4.9.ebuild 1531 BLAKE2B 5ff61c51bad33c6cb0469da3ebd98de40764bd09fc12e6904c8a3f91661a18c7f1de5e90db126a2f9835e2d6676817dde10d8279b570b7339f4e62a74f4c76b8 SHA512 bf62eddd1212635ccb858daf4f1fb54ccc06a053f05cdb86b5a11b2952946e5342ec9a07a85e6b78b041dbd126259655a17344a531a3d30e6939b4740452a60b
 MISC metadata.xml 344 BLAKE2B 383045f9629523bb66545a2e141c51056a1dffcc7cb084b251efd9da73253dbd4be8beebc659d65dbe2faf7852207db39feadac2ab07dff140db1c7f8dbf992a SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164
diff --git a/sys-kernel/linux-headers/linux-headers-4.16.ebuild b/sys-kernel/linux-headers/linux-headers-4.16.ebuild
new file mode 100644
index 000000000000..56c91771417f
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-4.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa"
+inherit kernel-2
+detect_version
+
+PATCH_VER="1"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+	https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}
+"
+
+#dropped keywords before basic tests are done
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+DEPEND="app-arch/xz-utils
+	dev-lang/perl"
+RDEPEND="!!media-sound/alsa-headers"
+
+S=${WORKDIR}/gentoo-headers-base-${PV}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	default
+
+	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}
+
+src_test() {
+	# Make sure no uapi/ include paths are used by accident.
+	egrep -r \
+		-e '# *include.*["<]uapi/' \
+		"${D}" && die "#include uapi/xxx detected"
+
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	einfo "Missing linux/types.h include"
+	egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9ad1302b8f28..b5b2d0be207d 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 508ddfaa3dd7..7b0d7c5e5db7 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -52,6 +52,6 @@ EBUILD glibc-2.25-r11.ebuild 5003 BLAKE2B 9d9334d713519b971f1d46a554f1474f74f373
 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f
 EBUILD glibc-2.26-r5.ebuild 25260 BLAKE2B f28cc4e685eb88a500655c60de886dc862495499413a27034bcb6e49db4a5737df081f813cdc1bf06f763fc03b652ad8ccf0b9d0cad3f975b8d7cf9309af1506 SHA512 a1a40a8b076dbaa71d1f778a3e17d1ff2267dddde68c69e2db68a860f6186eeaab083fad5935113d12ed86fd0d0f20ded0c662df29391e211728ec887f3a6260
 EBUILD glibc-2.26-r6.ebuild 25614 BLAKE2B 32bd3f11186c7f5619a7c83358cd5e416bc9c4ff6f6355ab9f65d68e94fefad99557bc993033a711fbea3f402c898ddcd494ecbc3c10f5e0c8dacdfce632b8e0 SHA512 256bbd3e1a5c4aaee844e4da88a0851608ec75fe7d1d10486849be57d14a202e4d10904873cdae565ae9ac216607072f765d18967007a0d16ea5f2103a76b20c
-EBUILD glibc-2.27-r1.ebuild 42649 BLAKE2B 731b82d1649c34ab3f32780443666941e2b73c831c06b68d678563f38063841513eae2d90acb7f540419046859ddc1002615bcbd57172d6f69454f4141851895 SHA512 d8dfbcddb7dc76f685a1071e495a130729aa1133a9ef7f2211732355b5c6b21ad074c91fb1b00eb3ec080b684dc449fe2e6e2eaf643abc1a7774fe449c5f89f8
-EBUILD glibc-9999.ebuild 42648 BLAKE2B a71edc5e47761984bbff09c422a1feb356e4a670725feadcad99ad7f9d6c7be39790dbee5d14bf9654f81d1488eb2c43bd903469531692e1b7fc883e47a409af SHA512 a066df7cdfea7b4e8e4938c78eeea27478f197cf8e3a26838c592bbc67880a5ac1e3696fe0907c3082044d87412b017f41ebb7874b85616933b99d71a01729da
+EBUILD glibc-2.27-r1.ebuild 41850 BLAKE2B f492330f493a63926de409d2a88a80a85946db6e94d24fe4a9969db115049ac5f68e71ffcec6b823ea157e28f4d145023c992693c7b16ad1b4733847f38a0177 SHA512 b9862f40eeef4eef8472e07a33c06c42def519bf52de39abe16859e0ea5ed4088bf55480221f90c3f63a0aadca6167229e77bafbabe535ca4fc56dbb4bd4230f
+EBUILD glibc-9999.ebuild 41850 BLAKE2B 81a39750dbc562c1fdffdc9fefa6f7c17b1e4a8d8f0e5512c95f4ed968bf752faaf7c2f71853eb4a835143348194fa1b9d4b123f1da88ec0873d4b7b33b297ae SHA512 90db26e5834175a50544f81355cdcce039d59655c1d31222ac884cb497828ecd2bd44c0992d10ecb0c1fa7e3fe1002509eeca83bd9b2d1a29608cc813d057324
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.27-r1.ebuild b/sys-libs/glibc/glibc-2.27-r1.ebuild
index 588eebae7f2d..3cc1a137ada3 100644
--- a/sys-libs/glibc/glibc-2.27-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r1.ebuild
@@ -754,33 +754,6 @@ src_prepare() {
 		einfo "Done."
 	fi
 
-	if just_headers ; then
-		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
-			# mips peeps like to screw with us.  if building headers,
-			# we don't have a real compiler, so we can't let them
-			# insert -mabi on us.
-			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
-			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
-		fi
-		if [[ -e sysdeps/riscv/preconfigure ]] ; then
-			# RISC-V interrogates the compiler to determine which target to
-			# build.  If building the headers then we don't strictly need a
-			# RISC-V compiler, so the built-in definitions that are provided
-			# along with all RISC-V compiler might not exist.  This causes
-			# glibc's RISC-V preconfigure script to blow up.  Since we're just
-			# building the headers any value will actually work here, so just
-			# pick the standard one (rv64g/lp64d) to make the build scripts
-			# happy for now -- the headers are all the same anyway so it
-			# doesn't matter.
-			sed -i 's/^    xlen=.*/    xlen=64/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    flen=.*/    flen=64/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    float_abi=.*/    float_abi=double/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    atomic=.*/    atomic=__riscv_atomic/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure.ac || die
-			sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure || die
-		fi
-	fi
-
 	default
 
 	gnuconfig_update
@@ -1016,6 +989,8 @@ glibc_headers_configure() {
 		export ${v}
 	done
 
+	local headers_only_arch_CPPFLAGS=()
+
 	# Blow away some random CC settings that screw things up. #550192
 	if [[ -d ${S}/sysdeps/mips ]]; then
 		pushd "${S}"/sysdeps/mips >/dev/null
@@ -1032,6 +1007,25 @@ glibc_headers_configure() {
 		popd >/dev/null
 	fi
 
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
 	local myconf=()
 	myconf+=(
 		--disable-sanity-checks
@@ -1050,7 +1044,7 @@ glibc_headers_configure() {
 	# So forcing CC/CFLAGS is sane.
 	local headers_only_CC=$(tc-getBUILD_CC)
 	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
 	local headers_only_LDFLAGS=""
 	set -- "${S}"/configure "${myconf[@]}"
 	echo \
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index e6d10969e8b3..519bc28c9546 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -754,33 +754,6 @@ src_prepare() {
 		einfo "Done."
 	fi
 
-	if just_headers ; then
-		if [[ -e ports/sysdeps/mips/preconfigure ]] ; then
-			# mips peeps like to screw with us.  if building headers,
-			# we don't have a real compiler, so we can't let them
-			# insert -mabi on us.
-			sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die
-			find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} +
-		fi
-		if [[ -e sysdeps/riscv/preconfigure ]] ; then
-			# RISC-V interrogates the compiler to determine which target to
-			# build.  If building the headers then we don't strictly need a
-			# RISC-V compiler, so the built-in definitions that are provided
-			# along with all RISC-V compiler might not exist.  This causes
-			# glibc's RISC-V preconfigure script to blow up.  Since we're just
-			# building the headers any value will actually work here, so just
-			# pick the standard one (rv64g/lp64d) to make the build scripts
-			# happy for now -- the headers are all the same anyway so it
-			# doesn't matter.
-			sed -i 's/^    xlen=.*/    xlen=64/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    flen=.*/    flen=64/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    float_abi=.*/    float_abi=double/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^    atomic=.*/    atomic=__riscv_atomic/g' sysdeps/riscv/preconfigure || die
-			sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure.ac || die
-			sed -i 's/^libc_cv_riscv_float_abi=no/libc_cv_riscv_float_abi=d/g' sysdeps/unix/sysv/linux/riscv/configure || die
-		fi
-	fi
-
 	default
 
 	gnuconfig_update
@@ -1016,6 +989,8 @@ glibc_headers_configure() {
 		export ${v}
 	done
 
+	local headers_only_arch_CPPFLAGS=()
+
 	# Blow away some random CC settings that screw things up. #550192
 	if [[ -d ${S}/sysdeps/mips ]]; then
 		pushd "${S}"/sysdeps/mips >/dev/null
@@ -1032,6 +1007,25 @@ glibc_headers_configure() {
 		popd >/dev/null
 	fi
 
+	case ${CTARGET} in
+	riscv*)
+		# RISC-V interrogates the compiler to determine which target to
+		# build.  If building the headers then we don't strictly need a
+		# RISC-V compiler, so the built-in definitions that are provided
+		# along with all RISC-V compiler might not exist.  This causes
+		# glibc's RISC-V preconfigure script to blow up.  Since we're just
+		# building the headers any value will actually work here, so just
+		# pick the standard one (rv64g/lp64d) to make the build scripts
+		# happy for now -- the headers are all the same anyway so it
+		# doesn't matter.
+		headers_only_arch_CPPFLAGS+=(
+			-D__riscv_xlen=64
+			-D__riscv_flen=64
+			-D__riscv_float_abi_double=1
+			-D__riscv_atomic=1
+		) ;;
+	esac
+
 	local myconf=()
 	myconf+=(
 		--disable-sanity-checks
@@ -1050,7 +1044,7 @@ glibc_headers_configure() {
 	# So forcing CC/CFLAGS is sane.
 	local headers_only_CC=$(tc-getBUILD_CC)
 	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE"
+	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
 	local headers_only_LDFLAGS=""
 	set -- "${S}"/configure "${myconf[@]}"
 	echo \
@@ -1108,6 +1102,7 @@ src_test() {
 	if just_headers ; then
 		return
 	fi
+
 	# Give tests more time to complete.
 	export TIMEOUTFACTOR=5
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 13767f93bd69..f9bd1cbd2386 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,6 +1,3 @@
-DIST gwenhywfar-4.15.3.tar.gz 2249350 BLAKE2B 278ee013fbcf1e05f8006b3b1bcf325e47895987e374868c9c64d1312a43485b61589d17ab1790f64b11d06c9976960b66f587157ca87749fa259502fa19e405 SHA512 a14d625518d94c94491df149f9e746ed8d769f4e43b6df24f51f4269f29005f7431e33e85de0bde0a81a2e876fea8ddad5ed4191114295d6c9ea2e94aba08799
 DIST gwenhywfar-4.19.0.tar.gz 2362848 BLAKE2B cfdde7b26c9ab26d0ab8ce45ccb8da417bc118507e24d7c4315d0f0480deb92e60f331147cde2145b7b41e4764d18266ed221632b0110e3735a20ce6a6a674b2 SHA512 d05b230f7c00247301428046bf9ed643915d0939d804c78622892ae85c81dfe244832a8375820d489277251b407e424a5cf9b19224ad14f7fbfae83485e00da1
-EBUILD gwenhywfar-4.15.3-r1.ebuild 1629 BLAKE2B 01995aba6b8b85da368900213dccd1d5bf1c55d0e1a29d59997324be92d49eee44f4972ba57dd403e8ceb75c095d0e3c9ec9216551e9e3b1fa145acc11f2250d SHA512 bd0edd9354418dbeb9792f4371d0d862c2e7cfb5cddde2f682b342ccf08313681f0a4b7adccf7407a7d7e7c3e5faa45c334fa36bc546ea427fb454fb2f4aab5c
-EBUILD gwenhywfar-4.15.3.ebuild 1422 BLAKE2B 32a46d6e8a1f4a07b67522531f014f38915fc5f6b5ce3479113ddf60d409f42247d77320ee3aed6d97bf3a0870958dc589f7eae40489927f6fd5f13c5b6662e4 SHA512 230baa16807362d4a0c48f9d9392c63e82abd2f44d6528f4431b96a0ba86dd2b073f65daf907232bd7e01b24ec85b1c189f611ca8af9ca6a657fc5256bf8d8af
-EBUILD gwenhywfar-4.19.0-r1.ebuild 2803 BLAKE2B ae429e498b6dd78034001b2214536c4d8b8823e98f3499f8a1ed3957bb35d15f5ceb0b66b3a7703b888e304987e66542c0e5fe32dc4bb53843280ae952da4792 SHA512 d47fa50a141033eae8f57b421a7cdfaefe2d71348a2e0803caea32edab8340b043472478c6240d11f11dddd3b38184bffa4d34eb40f85850bae261ba309962ab
+EBUILD gwenhywfar-4.19.0-r1.ebuild 2801 BLAKE2B 7d542d3f8e6f51c2ec9ed90abb4e890b07f21f3bbed1e3abc46450d7ecf460eed2c83fbfd7f77fd6906726ed8d000c783ddcf461ae113c3ae3ebd8b836480cf0 SHA512 cd53962b1f7422c7c25259dcb1a5e20289de1b7d67db45f3e940d2d62c8b1757ea41d68a49615f207d189542e09e91cc1bfb92414b742f35477764016bfff485
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.15.3-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.15.3-r1.ebuild
deleted file mode 100644
index 9c3542e3c33f..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-4.15.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P="${P/_beta/beta}"
-DESCRIPTION="A multi-platform helper library for other libraries"
-HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
-SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc fox gtk qt4 qt5"
-
-RDEPEND="dev-libs/libgpg-error
-	dev-libs/libgcrypt:0=
-	dev-libs/openssl:0=
-	net-libs/gnutls:=
-	virtual/libiconv
-	virtual/libintl
-	fox? ( x11-libs/fox:1.6 )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtgui:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )"
-
-# broken upstream, reported but got no reply
-RESTRICT="test"
-
-src_configure() {
-	local guis
-	local extra_opts
-	use fox && guis="${guis} fox16"
-	use gtk && guis="${guis} gtk2"
-	use qt4 && guis="${guis} qt4" && extra_opts="${extra_opts} --with-qt4-moc="$(qt4_get_bindir)/moc""
-	use qt5 && guis="${guis} qt5" && extra_opts="${extra_opts} --with-qt5-qmake="$(qt5_get_bindir)/qmake" --with-qt5-moc="$(qt5_get_bindir)/moc""
-	econf \
-		--enable-ssl \
-		$(use_enable debug) \
-		$(use_enable doc full-doc) \
-		--with-guis="${guis}" \
-		${extra_opts} \
-		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.15.3.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.15.3.ebuild
deleted file mode 100644
index 8dd748cddb84..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-4.15.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_beta/beta}"
-DESCRIPTION="A multi-platform helper library for other libraries"
-HOMEPAGE="http://www.aquamaniac.de/aqbanking/"
-SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=01&release=201&file=01&dummy=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
-IUSE="debug doc fox gtk qt4"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.2.0:0
-	dev-libs/openssl:0
-	>=net-libs/gnutls-2.0.1
-	virtual/libiconv
-	virtual/libintl
-	fox? ( x11-libs/fox:1.6 )
-	gtk? ( >=x11-libs/gtk+-2.17.5:2 )
-	qt4? ( dev-qt/qtgui:4 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )"
-
-# broken upstream, reported but got no reply
-RESTRICT="test"
-
-src_configure() {
-	local guis
-	use fox && guis="${guis} fox16"
-	use gtk && guis="${guis} gtk2"
-	use qt4 && guis="${guis} qt4"
-
-	econf \
-		--enable-ssl \
-		--enable-visibility \
-		$(use_enable debug) \
-		$(use_enable doc full-doc) \
-		--with-guis="${guis}" \
-		--with-docpath=/usr/share/doc/${PF}/apidoc
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	dodoc AUTHORS ChangeLog README TODO
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
index e0a68cda5fba..5509c4d393a1 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.19.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=01&releas
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
 
 REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 9a35dccb40a3..3951d75e1ad9 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 1e3979505260..8562e3994f68 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -11,6 +11,6 @@ DIST htop-2.0.2.tar.gz 476364 BLAKE2B f5519977b4bd6d189cb7f379a9f9b535a4b67a575b
 DIST htop-2.1.0.tar.gz 302938 BLAKE2B 3e290a3dbb0bf5424780ba5dcb9de8ea478bf4cabbbde202c19eb3db7e0f8d1e108ec3ea41544ac095097c39100417c72477dab96f104a6317f4edd06d69199f SHA512 203e8f4abd63334330fc673f6c9609adbeab763d80f553d8b48670091d18dd347599a9ce2dbbac374fa4a13fa904948711a441fa676f52ab1612bd2b4ee4c6eb
 DIST htop-3.0.0_beta3.tar.gz 169576 BLAKE2B 6d62a818b53933de1d09e316eac41497f6f9c75b1fced691540e91348af0a0272f38dfd2dd935191c0782d2c4ca2fc6bee64d5827851329b73d7c31c590d3e9f SHA512 05b2f817b67206dce0f727394cc78437ecbd4575fed898dca0a7b25a7acaab42e8b674f4c040139080759d04e73e5fda58aab89c184f2b10e35edf19385e680a
 EBUILD htop-2.0.2.ebuild 1390 BLAKE2B d38a5264ba9f0f2c8467f3dc2ad61440c50945a2ae2b8782879e93084b405253899a8430aff263181b9b11bc74376d8a9f087bcbf4e29908e3c9bdd607cf8d6d SHA512 82e5bc99fe341b7492f219193fb74c241ba035455e0faae7cea42635a99069c6d195157d8bb6e13277483e47d5df37a579dcf57c0a6e0a33ec31d983b9b9f5c7
-EBUILD htop-2.1.0-r1.ebuild 1979 BLAKE2B 43e3bbfcae759dcbe92f57e8d745a09170a2110ea8b3aef0f76e73c5e07098a589df3194aee217a98b109701c72568403d57562c426d141066a4aa409dcf776d SHA512 69685c882193112e4dfea70f19d61e56a75a4e5cea1a3f39598e87cad6cb97cc8323bdb8477045e363db1cea8ea844ad13bc2e50fd8f59fe5e10828bfea0d53b
-EBUILD htop-3.0.0_beta3.ebuild 1947 BLAKE2B fbbc791c0d7a8952dace97ee7f00b977109046f69b0ab031d6ca0ac88e2a2a7cae42140a83980f2107c5a2f7f2a732c3dd402f377c3ad8f7a24ddf4bbae42b36 SHA512 58dcda1cccab33d3c482bebb73dea70be27d8aeba6d081dfc938c9847a57567fea206b9f80add7f8d1cbe887b1657f06aaf9010706d010709599676b64fded4b
+EBUILD htop-2.1.0-r1.ebuild 1990 BLAKE2B 9e2842b82870620628f502cfb81e53436c78eca5ece566cd393751e6da1878a792d56632c294b52ff4c4aee02bfa1ffc81cbd22da8e7f52136bb6073a9de98ae SHA512 34441c4ea5ea25169d6bf84c89008b1b0d1d54eaaf1fbc6e46b5f3afabe561578ec8823bd02d6da2f563ae87213284fba66436657cb74bb1b18a6502ada5cd53
+EBUILD htop-3.0.0_beta3.ebuild 1958 BLAKE2B f64fd16bfe6b1cdc99131298102eb3ba562da99dfc3ffd7e50ff12ea5402b983fd7215c689c21570d44aebac6c6f6f6ef4be47192ed5ed79085a498bbedb14ea SHA512 fbc846d3d4c64bdb173dd6d0dc6f8ea260e428dd8099010dc4ce4ef63b444a94e87ded7d43aba377007ff1f6c6c569211a41ecfb91739d38dc7db1eaa81e51cb
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.1.0-r1.ebuild b/sys-process/htop/htop-2.1.0-r1.ebuild
index 14a9ecd0dfb1..8eac59d43915 100644
--- a/sys-process/htop/htop-2.1.0-r1.ebuild
+++ b/sys-process/htop/htop-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="kernel_FreeBSD kernel_linux openvz unicode vserver"
 
 RDEPEND="sys-libs/ncurses:0=[unicode?]"
diff --git a/sys-process/htop/htop-3.0.0_beta3.ebuild b/sys-process/htop/htop-3.0.0_beta3.ebuild
index 97456ae73a1c..9400d99d515e 100644
--- a/sys-process/htop/htop-3.0.0_beta3.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta3.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_beta* ]] ; then
 	S="${WORKDIR}/${P/_}"
 else
 	SRC_URI="http://hisham.hm/htop/releases/${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index bf5cd941f954..772ff3676392 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/python-ipaddress/Manifest b/virtual/python-ipaddress/Manifest
index db02e7e9b466..2ac991e48050 100644
--- a/virtual/python-ipaddress/Manifest
+++ b/virtual/python-ipaddress/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-ipaddress-1.0-r1.ebuild 545 BLAKE2B 90cdb697cad6479fa0449830eef7898b7db1fe95df2c2603db1bab40fc055d03b947a6f1fad98c61bcab91a2ef3f132456ad0f8be2a1167b42c4f4ac8708cb0e SHA512 60b217015270e8b34bf148ba3a111d8917c9dd3a43b9e018add5f235a289b9467c5d93b89390a2bdeefa5eb88309b34368ff58a26c7b78f13d9159b485a90275
+EBUILD python-ipaddress-1.0-r1.ebuild 556 BLAKE2B 9cbdeda8ce72928d3d28bc3412702c126f5d73b83fd19334972c41c4d7666faca007bb7c55b59af36a18c3624abb31107e5c6b6fc4d92599e24f41cacba5fe97 SHA512 d6b1b3d9c0d780cb683c8cb846c1ca7bd6032ff796f349d4b03a749bfcff9aa9a40965243e53fd4599252a5b44574455dbe7a105c6e4c5803d9edbc20e56748b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
index 08b45843ffbe..a8e01d4d1510 100644
--- a/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
+++ b/virtual/python-ipaddress/python-ipaddress-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python ipaddress module"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a4da1c77c7e1..db6716fe9807 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/mirmon/Manifest b/www-apps/mirmon/Manifest
index d0d362b80e4b..056cb8838308 100644
--- a/www-apps/mirmon/Manifest
+++ b/www-apps/mirmon/Manifest
@@ -1,7 +1,4 @@
-AUX 0001-Add-rsync-monitoring-support-to-mirmon.patch 2534 BLAKE2B 7291c584d990ccfa173189d07f7de11eeab4eb8b86846769a02b1f4830cf1bcd21d88cacbbe18b3517f609cd0dc9523f199cb31bdef224c7959bd5c79394d31d SHA512 36bee0706ba782a8706ee88d52e913f10d3f1b84a5979f252aa947b44ed30c7f9c5db5b17dbe0b5bf6dae7fd899c926f2a79349081731d00f4160808d32a5844
 AUX 0002-Add-ipv6-monitor-support-to-mirmon.patch 970 BLAKE2B 8a78bcf62e020d4e8e369173e548d721be0584acc91be47c9e1aec3c1308fb3ee47033a842e0e9ffe172fccb3e98d52916f5441022c1ef87aa798295eca9ffe9 SHA512 ea6f7f51e516b944f69b6c76ecb48e36a1127867fdbaf558c9b81253ee47793bb017dfb0df830343c21dc8c8023390c6b53ef9f16e798731ab0c3f4b201dc9ad
-DIST mirmon-1.38.tar.gz 33021 BLAKE2B b46778fa3cb5e54ecb5ac5951b26a4b17662b58e99fd78e701a588aa76e7d2033b8c02ed6584737c20e7269bd043a1c508d516007cbc10bca87b581455f84b9f SHA512 a879f7ac979ad31d24a27940600c7a95e0f9db6cc8654fd36f830f9a9cfb9d3a7e86fcb27870da3889ad159028a6807203664038e985c12a5f59a6b19b473b08
 DIST mirmon-2.10.tar.gz 72212 BLAKE2B e1f6a68369bd97110d88d3171d552133f48ed8234b06c632f9798b5fd51dcf59e048d900f116fbd185adb86e8c9ee9ff63152a8dddf41dda6b01310644575d8b SHA512 e6e371e1b78b9a7e8e27dd1a68b07436430d9d1cbaa96ee6738049c4878c70b8736e24d86be2571f0a08b263b763c2d8883d78925ac703336f7a297903413d4d
-EBUILD mirmon-1.38-r4.ebuild 1058 BLAKE2B 9f5ba9d09321860b989cdc246466acdce381901ae1824b9d8a461299f5dd943ae626d646ce0b12516990fd6979db7bae58d28baf98f063b058a99b440adb0b3c SHA512 3f048753db716ddc339299b0fd3f3cf4c1f802de4237716ccef7f6f5219f323637c43599f25e0a0c3cf005209157be58d76bd113a60a01ee6cef679d052e97af
 EBUILD mirmon-2.10.ebuild 905 BLAKE2B 26c5c8f7c23777c751ab4bf0f2e5640358dad7dc615b04e08001f24b9eccb9eba2a11dfb5463d3c2ac83f2fc6a4d64ac2283155ed92b2dc3ef298a77e7847a9c SHA512 c64a6d5121e7208667c4eebab50c6219ff40a62fe7764b067cfcce81504d2686980a5de91f0b52b7a9788987448fd1098b95ab6959c92894891a1db6aa174319
 MISC metadata.xml 301 BLAKE2B 5fe42bb4c75fe17ecef559afa5a288fe1f4529017ca04e4fd265045bc23371d1bbe5851c9a85ec3be57957ab05c2ea7dfc63412561e7e2b78340b97e2fb273f4 SHA512 7e3589110474bd73e8ce39b9056dd426d5d68eed8f6babaf90357e629feda96e4ec03e568a8042ff7dfe8521696150d794c3344f7773b4df060c0ee77d7dfb8e
diff --git a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch b/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
deleted file mode 100644
index 0c8c69d7795f..000000000000
--- a/www-apps/mirmon/files/0001-Add-rsync-monitoring-support-to-mirmon.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=289942
-
-From d91f1f17be33dfc5ed771829639791b5463417a2 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 28 Oct 2009 20:58:45 -0500
-Subject: [PATCH 1/2] Add rsync monitoring support to mirmon.
-
-You will also need to modify mirmon.conf to use probe-mirmon instead
-Original patch located at: http://www.tug.org/texlive/mirmon/probe-mirmon
----
- mirmon       |    2 +-
- probe-mirmon |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+), 1 deletions(-)
- create mode 100644 probe-mirmon
-
-diff --git a/mirmon b/mirmon
-index a1261f5..6c0aaa8 100755
---- a/mirmon
-+++ b/mirmon
-@@ -384,7 +384,7 @@ sub get_ccs
- sub type_site
-   { my $url = shift ;
-     my ( $type, $site, $home ) ;
--    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
-+    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
-       { $type = $1 ; $site = $2 ; $home = $& ; }
-     return $type, $site, $home ;
-   }
-diff --git a/probe-mirmon b/probe-mirmon
-new file mode 100644
-index 0000000..a7fe513
---- /dev/null
-+++ b/probe-mirmon
-@@ -0,0 +1,50 @@
-+#!/usr/bin/env perl
-+# $Id$
-+# public domain.  Originally written by Karl Berry, 2009.
-+# 
-+# Probe rsync url's for mirmon; use wget for anything else.
-+# From description at http://people.cs.uu.nl/henkp/mirmon.
-+# 
-+# Also requires a patch to mirmon itself to accept rsync urls
-+# (and I wanted https too):
-+# --- /usr/local/share/mirmon/ORIG/mirmon	2007-08-18 18:05:47.000000000 +0200
-+# +++ /usr/local/share/mirmon/mirmon	2009-07-03 22:38:00.000000000 +0200
-+# @@ -386,3 +386,3 @@
-+#      my ( $type, $site, $home ) ;
-+# -    if ( $url =~ m!^(ftp|http)://([^/:]+)(:\d+)?/! )
-+# +    if ( $url =~ m!^(ftp|https?|rsync)://([^/:]+)(:\d+)?/! )
-+#        { $type = $1 ; $site = $2 ; $home = $& ; }
-+
-+exit (&main ());
-+
-+sub main
-+{
-+  my ($timeout,$url) = @ARGV;
-+  my $ret;
-+
-+  if ($url =~ m,^rsync://,) {
-+    $ret = &handle_rsync ($timeout, $url);
-+  } else {
-+    $ret = system qq(wget -q -O - -t 1 -T $timeout $url);
-+  }
-+  return $ret;
-+}
-+
-+
-+sub handle_rsync
-+{
-+  my ($timeout,$url) = @_;
-+  
-+  my $tmpdir = "rsync-tmp";
-+  -d $tmpdir || mkdir ($tmpdir, 0700);
-+  
-+  (my $file = $url) =~ s/\W/_/g;  # translate all non-letters to _
-+  my $local = "$tmpdir/$file";
-+  my $ret = system
-+             qq(/usr/local/bin/rsync --no-motd --timeout $timeout $url $local);
-+
-+  @ARGV = ($local);  # don't care about our args any more.
-+  print <>;          # let perl autoprint
-+
-+  return $ret;
-+}
--- 
-1.6.4.4
-
diff --git a/www-apps/mirmon/mirmon-1.38-r4.ebuild b/www-apps/mirmon/mirmon-1.38-r4.ebuild
deleted file mode 100644
index ede9c4ac7ee2..000000000000
--- a/www-apps/mirmon/mirmon-1.38-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit webapp eutils
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="Simple webapp to monitor the status of mirrors"
-HOMEPAGE="http://people.cs.uu.nl/henkp/mirmon/"
-SRC_URI="http://people.cs.uu.nl/henkp/mirmon/src/$PN/src/$P.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.5-r2"
-RDEPEND="${DEPEND}
-	dev-perl/File-Tempdir
-	dev-perl/Socket6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/0001-Add-rsync-monitoring-support-to-mirmon.patch" \
-		"${FILESDIR}/0002-Add-ipv6-monitor-support-to-mirmon.patch"
-	# set the proper interpreter
-	sed -i -e 's:/sw/bin/perl:/usr/bin/perl:' mirmon || die
-}
-
-src_install() {
-	# Don't install empty dirs
-	MY_CGIBINDIR=""
-	MY_ICONSDIR=""
-	MY_ERRORSDIR=""
-
-	webapp_src_preinst
-
-	for file in mirmon.html mirmon.txt; do
-		dodoc ${file}
-		rm -f ${file}
-	done
-	cp -R icons "${D}"/${MY_HTDOCSDIR}
-	rm -rf icons
-	cp -R . "${D}"/${MY_HOSTROOTDIR}
-
-	webapp_src_install
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index cd721f0cbdd6..ad97a3955e22 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index 1bc6d6953b19..a1db42fca30d 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -1,3 +1,3 @@
 DIST falkon-3.0.0.tar.xz 1985800 BLAKE2B 8505e2c91600d265c28f70c37bf9e8f669ecd907dd9263371a4a4c10b854d32415ec1a3fd6ac163b297d0a9f42c542d4691a6cd417ed81864585f0c66b769e34 SHA512 1d99ecd47022986570dd6bb9b57484abe30838bf52daf669c977e1d2a9381efdd60912fd72b97e0b43b6102159f4343c4d1589d4f6442d0ed62c24f1482a8d97
-EBUILD falkon-3.0.0.ebuild 1583 BLAKE2B 518f7ef4219a2b3bf3bd24842075e1427355182b441a1f35cdd7aab0c743375553856e95a7db7bd8566169319d953e5bffb650b97d1b8338dcaba7d58b3b5cbc SHA512 8425a175b9dce7976ee78cfd83e4a43a08529176ece6d3fefe560f73a52d3cae8ef637dc5a40d6f4b83fe146d543ea9e902ee4671de7ef47ba54927bdcda9384
+EBUILD falkon-3.0.0.ebuild 1607 BLAKE2B baca71f77e3efb3cb82f5f8db7c4b2d2b51b3105fb7441dd09b44bcf031c9ce866bcd7e147c842bc5fb1fc87b05eafb81f88dd3ad513934f43dfddcb9ac41cbf SHA512 43278c193e9a3ec3de9d0f8026bbbf1cae93bc8c3528d4855b354e672df94a930cdb65fa4c8e5f968be1c962b3761cb799f089bd7f526f9e2b4838b733cf3b96
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/www-client/falkon/falkon-3.0.0.ebuild b/www-client/falkon/falkon-3.0.0.ebuild
index 6da8f0a0600f..e8af4f7d2fa3 100644
--- a/www-client/falkon/falkon-3.0.0.ebuild
+++ b/www-client/falkon/falkon-3.0.0.ebuild
@@ -5,6 +5,7 @@ EAPI=6
 
 KDE_TEST="true"
 QT_MINIMAL="5.9.2"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Cross-platform web browser using QtWebEngine"
@@ -15,7 +16,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="dbus gnome-keyring kwallet libressl +X"
 
 COMMON_DEPEND="
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 940990435a83..14b1f2d592a9 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_66.0.3359.66-1_amd64.deb 53338872 BLAKE2B 79c6faac0e087e229be9f69a1b8cc365aed48c808f359c38807b116e05780e8bc6e7635fe8704a18f3e7933166c7c2107a498cd2eb8f6c7e61b253e81ff9211d SHA512 0321bd17ab233fc828d3620c8b975123d2a67f06922c8fd7cbfc8910c86d995cfde969e05a38e4770c07409d03a8072565272bf0c0fc9e99f6686af7712f2a1e
-EBUILD google-chrome-beta-66.0.3359.66.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
+DIST google-chrome-beta_66.0.3359.81-1_amd64.deb 53236258 BLAKE2B 7bd0c4655abbcff6166c50f92bcc73e7cbe3a8c3417dc7420c66bb14c9128a5a278508a62a6d7f06aa0a32908d1961ff110a5bd375c460aba38b5a13d672a6cd SHA512 89b8e916827bf29f700abe9e10a014e06a1e38a4f1e267c3ea3887d6be1ba9735536069855509bbf187291cc0d6d02cb07945d6e11f77d48fb4f60a1f1e23cce
+EBUILD google-chrome-beta-66.0.3359.81.ebuild 3615 BLAKE2B 6d174a808c9f33ec215bd4caa269afcbc50a5d89a96d30f841d9b5f2355bc8fbfa06ea96aa1c2af61138e529a6248941b19f398d06a87f6d337e98926ff767c1 SHA512 862516fc6d507feaae8c2a2d424c47d38f0fa557f5254dfd3b9a7c2caf84febe85e72ed70ee84599a94028eb168360ed545c318ff95819babe2ef708a389845f
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.66.ebuild b/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.81.ebuild
index 500479b752d3..500479b752d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.66.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.81.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index d0b6b5d04634..b31907a66b88 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_67.0.3381.0-1_amd64.deb 53638156 BLAKE2B 09752cc4903ef57abba74878b180d27768d66548362a650ee6cb44d4e81099ee07ce5ed9378529432b570603ace1f9e933e17b07c369cca0d1f1329443d06e74 SHA512 51a0b11be1de55cfd7dfb62c3d3b2f656a316ea114b7451f2d3f344b3c976b8bc9cd417b8c238a14be9af3eb30cd17493227a9ae75f2ea9e3e80b9597317b317
-EBUILD google-chrome-unstable-67.0.3381.0.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
+DIST google-chrome-unstable_67.0.3386.1-1_amd64.deb 53711918 BLAKE2B d01062271022bd35f89a37569da793d8193beacbefc9f3bc5b66d35de3fa50cf440543f4edd162bc255bac9cb9c99b04fb8fac102f6928b88affb3ceac5146b7 SHA512 998af727b7d606849e901624461e606628ac05d834b4b12cadff2a44c83d98dcf8d668e0b54212ad7f3129a90c9930c5162acf34d095e33a5fc35e78dd3c5fab
+EBUILD google-chrome-unstable-67.0.3386.1.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3381.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3386.1.ebuild
index 43d5352b4dd5..43d5352b4dd5 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3381.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3386.1.ebuild
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 07ed7e3e52f1..c500be8acba9 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -4,5 +4,5 @@ AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da8
 DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228 SHA512 61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
 DIST w3m-0.5.3.git20161120.tar.gz 2177917 BLAKE2B 48e7d9fee00431d65e4ae486d1cf5a376542fb0655215d95455d6f0e3ba63a6dfb243a858e0bb5e745ac75713091b17fa5c5a63c91a3e837c911ef1f576ce497 SHA512 81ecf9e5d9067a82efa5464e5f9396327a6333f9e414458a972b2b7bff138bd17c490b5258e34cb1e338c7a6c0dd6105a1bfd1e0d02edfadead79caa39106a5c
 EBUILD w3m-0.5.3-r9.ebuild 3245 BLAKE2B 2676bf8570023cd1799890f669a5f48dc13002391fe2f39164f02528998787c930ecd18cb82680ea63c51d70fc4e3f7f464bee245a97f206663d9257651a5f51 SHA512 da84bf3215255f01edae8a98e5eb76c29c48ee3b021ad219d2d443fa4f6525ba11259fcde39bcc9bdc9ad02a6ef83a1a306eb4898ee992f8fcf6e9c5fec8d3f9
-EBUILD w3m-0.5.3_p20180125.ebuild 3207 BLAKE2B 1caf44026b4b32d4efe4c3ddf3f35764448279cdafe6624f4426c0193903bbbca24ef1613c0253c96e0e51c559b36923b925d5d77ed66eeaa22adcacd2fe6995 SHA512 8f65138b152193179e4bc2f8aacda03bd03aae43dcf30c47618281ca7b032c5ef1eff737acb73c25bae423c49cd39481a7b2ef4217b8968742739ad791ed8761
+EBUILD w3m-0.5.3_p20180125.ebuild 3206 BLAKE2B 8368dc761b2131d571722dc3a2280c10adfefa8ec25d4359c63fad8da840ed7f711b9bb5b73c3ab3fe80e6c1d6f203b18a4818799dc21a865d92389a531cc73e SHA512 09eb7b79afca3e195be90f2e1ecff7826f40ecf9d5025700db42d018806304fa5101600b84e8877250b6c002de2ef2f82f431fa8ff4ae5b1b60a7f33c468b076
 MISC metadata.xml 522 BLAKE2B 4f89e2d965f7cc320983d501b67f2dda0134745d63e98b488fb3bdcfd6dfd2ce2e0fe12f8b6fea88818166298906c661db47405ab4de1f27cbbec37ca52fdedc SHA512 1fb6f6e6121f5673e809a626f840ff524b6e58260a9e2ac5b537e1f3d04cf2371b1ff03808da757848931275751a09fdc872f431b9162927fabc0b3e64305317
diff --git a/www-client/w3m/w3m-0.5.3_p20180125.ebuild b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
index efc1e7d370ee..815256311781 100644
--- a/www-client/w3m/w3m-0.5.3_p20180125.ebuild
+++ b/www-client/w3m/w3m-0.5.3_p20180125.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tats/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.g
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
 
 RDEPEND="dev-libs/boehm-gc:=
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index a0c32c254003..70453711e495 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 9532a4cc3782..06e03e684397 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_66.0.3359.66-1_amd64.deb 53338872 BLAKE2B 79c6faac0e087e229be9f69a1b8cc365aed48c808f359c38807b116e05780e8bc6e7635fe8704a18f3e7933166c7c2107a498cd2eb8f6c7e61b253e81ff9211d SHA512 0321bd17ab233fc828d3620c8b975123d2a67f06922c8fd7cbfc8910c86d995cfde969e05a38e4770c07409d03a8072565272bf0c0fc9e99f6686af7712f2a1e
+DIST google-chrome-beta_66.0.3359.81-1_amd64.deb 53236258 BLAKE2B 7bd0c4655abbcff6166c50f92bcc73e7cbe3a8c3417dc7420c66bb14c9128a5a278508a62a6d7f06aa0a32908d1961ff110a5bd375c460aba38b5a13d672a6cd SHA512 89b8e916827bf29f700abe9e10a014e06a1e38a4f1e267c3ea3887d6be1ba9735536069855509bbf187291cc0d6d02cb07945d6e11f77d48fb4f60a1f1e23cce
 DIST google-chrome-stable_65.0.3325.181-1_amd64.deb 52132868 BLAKE2B 8a40527aa5c6b6f82ed5ec0436a1887989029e514d90306b8d459ed71740fd7184cf5f4c6b0427b41e15b32cc7176c7cacfd3cb34270cc2ee0e0e6c677962e6f SHA512 b80a02753ca302967dadbfc3336eab8577ff3940fea1270454c43c6bf26bd64bc6178e8d70a44aa418a3ace47cabf49d7da918d806d2957415fffb78b7faf98b
-DIST google-chrome-unstable_67.0.3381.0-1_amd64.deb 53638156 BLAKE2B 09752cc4903ef57abba74878b180d27768d66548362a650ee6cb44d4e81099ee07ce5ed9378529432b570603ace1f9e933e17b07c369cca0d1f1329443d06e74 SHA512 51a0b11be1de55cfd7dfb62c3d3b2f656a316ea114b7451f2d3f344b3c976b8bc9cd417b8c238a14be9af3eb30cd17493227a9ae75f2ea9e3e80b9597317b317
+DIST google-chrome-unstable_67.0.3386.1-1_amd64.deb 53711918 BLAKE2B d01062271022bd35f89a37569da793d8193beacbefc9f3bc5b66d35de3fa50cf440543f4edd162bc255bac9cb9c99b04fb8fac102f6928b88affb3ceac5146b7 SHA512 998af727b7d606849e901624461e606628ac05d834b4b12cadff2a44c83d98dcf8d668e0b54212ad7f3129a90c9930c5162acf34d095e33a5fc35e78dd3c5fab
 EBUILD chrome-binary-plugins-65.0.3325.181.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-66.0.3359.66_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
-EBUILD chrome-binary-plugins-67.0.3381.0_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
+EBUILD chrome-binary-plugins-66.0.3359.81_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-67.0.3386.1_alpha.ebuild 1308 BLAKE2B 604e15f5d5ba5fa9cb343e4a409a463ffaf15dc05f53f4af4dc165a127101dfaf642f24f2cff55e313376e90f30a4490727edb55350e1aeec1cc12e6e691a4b1 SHA512 4c374994bf51ea3791ed328846709be41540027fd5a1f57a991c462a04962e00240132ae00010f592098ff6869408488e1a3b6c36b69dfe553d36b8296c5c4be
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.66_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.81_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.66_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.81_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3381.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3386.1_alpha.ebuild
index f2cb5723b3da..f2cb5723b3da 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3381.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3386.1_alpha.ebuild
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 7dbb76872d69..190b269b6551 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 6d02cb9fd433..5ba26181ee69 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,4 +1,4 @@
 DIST xorgproto-2018.4.tar.gz 493597 BLAKE2B f25a637317ff2d7ba34d416368261b5afb617e42a1fb642cc78ab3e877752a81291fe0523d1af6cd0fe27399676b14a70ceea7178d521187423bb503c9b1c63b SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362
-EBUILD xorg-proto-2018.4.ebuild 1795 BLAKE2B 565057c3cfaa1b8cdc7f41c70479f034917b8195b7b268a42d9e8e27e918371a05c64ffad10a4b80aadf2aaed8a49cb22fcb569126f17180a69266ef4fc43abb SHA512 177e44feb6533955c41f52b7fe6cbe1c5263edf7c91eb751059ee63e555df4701d6e60cfbc7a70732e2d238b5444e021915430e67334673380fcd95d92fc5c2b
+EBUILD xorg-proto-2018.4.ebuild 1806 BLAKE2B 4a884ca56f53a7521a1e2f6f939e9c80664591a9c32a18d40419d6dca59644f70f4e6ee9cdac64f5ec426e07053685c434ee893a0e5ac3407aea6a0129215d84 SHA512 86d612b80e81b1e7d6058e2f809a30b9112663a75cd8284c5b94b85b8032fb504452a3a94ecfd22f9fb59585a0479be3df262133097099a253e55b2c16c04944
 EBUILD xorg-proto-9999.ebuild 1779 BLAKE2B 80ae4a59428a02d2cd6d282b46eabfb9d5722a4e131303ec99c648f03d24431ba430468d570fc9099fbf012d83236f4211f9b88238ba50e0fa77e7dd0b016491 SHA512 f5cbce5ea638fb9c0520c5572e0fc39c47ed3b2c3cfd6fe105d2641136f240acd377bfaf9efc336decaf3670ef31b0bfd0d67e1305966a0a0279450d3383f685
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
index 1d4589a5e929..7dd946564a92 100644
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 3511153d33c0..00788914c20b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
index 6d11a8dc4185..a89de6defcd4 100644
--- a/x11-libs/guile-gtk/Manifest
+++ b/x11-libs/guile-gtk/Manifest
@@ -3,6 +3,6 @@ AUX 2.1-prll-install.patch 421 BLAKE2B 137bb381668c7540d56f15c8246d79a08c4931b2e
 AUX 2.1_migrate_gh_functions.patch 1872 BLAKE2B a82d98508469b3233215f672f15018a32752ca2505bbf414a01382553ea45fcb8b075cec0647198021d165bdc01e4364f7f8f919049a94a15b2861216d2a78e3 SHA512 7b749c4a438da1a98d266ca7e1e7923400121af47c52b3f8715a1cebc1c60c7c6e2fda9992891b49c866d9121f64182c629615900d285209fe3aee22e9976ba8
 AUX guile-gtk-2.0-g-object-ref.diff 1239 BLAKE2B 8ee7fc847befc089e7e9171c17b5a950b5e930241dccff2bd497909206c54c31f1384b204ed7c3ad4fbda8c0961dba494945609ed1ad7c0f78ee2bb9bee46b29 SHA512 ad72eff398d573450127dab756207974b56b48161d79a13b907ed58dc17ba63b1256478ab8d2d6c22ec03fd106d9814e6a4d9ca030ee203c1af474a28faea513
 DIST guile-gtk-2.1.tar.gz 781985 BLAKE2B b3387ef9ac79935fa9cf2b7d35f4012dc0748ecbade131b2c73d8d4513d90f84164ec3f196fafda8ba77abfd2a0b8dadf9dbc0118281fc06db0a36d2f533592a SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7
-EBUILD guile-gtk-2.1-r2.ebuild 941 BLAKE2B 850cf3490cae6c9045bc256c434ccdfe832aafd553fd7cc2b62007f75718652847dfc507f1a94ea886127aedb495e4819e87a589a981ad890519efa8398af3ef SHA512 2b5d98ae19552633d99090448fce793cabe09f7303c09f28b953dc21f8bd23ed369c1ce75acdb08263f2799adf9eb7265b241946faa0a5d5e4b6edd055f81014
-EBUILD guile-gtk-2.1-r3.ebuild 1007 BLAKE2B 23ccd4ea42a9634a8e8dc80b3f650a6b083946cea859dd69a0cde5ba50221dff508d93b42fd9134600f2d52ef06bb489a58ea8ded164f078b5e70e6b83a45443 SHA512 f823c66d9773159cf9c9de6e1903d3eeaacaf9925f513293d4bdafbbaedbc4d7008df2c3da75ac31a613e578162363381f9455375b8434101fba237c15b8c773
+EBUILD guile-gtk-2.1-r2.ebuild 936 BLAKE2B bf3f7b37cdfac6b5430157311049f38dae49bf290b6401352be2a429437151f9dd1cc12c4b6d0a5c142e29abbbc9c0db16d254966b5bbb78eb851cb528ea47b2 SHA512 b570fe2dc0060f3a03d5c710ad3fc742636f598f9332f711f94291268dc02dbcad090e91b4e3207487a9dd4ddabbce3bd8b1cfeea6729100db4b757f7f119280
+EBUILD guile-gtk-2.1-r3.ebuild 1003 BLAKE2B d0e02f0f57cf6af74526c993c600819398aa2c9738ffcfbed4e43bedd1f36b8051037ad00ad7a89c9dd444c1752f4a4f20bb022d33925d0ee8dff72ded9f4211 SHA512 63203feb3293e955d417cdc6f33e6ff577cfe21ae09cec11cbecd6c5149613de2b451e96ab63d21954ae00f65e0a77776dfe8af4bd77c7ecf571a76dffcfbf8a
 MISC metadata.xml 384 BLAKE2B 0825ebf9da828bd733111afeafa845331623c6f61a7a8c396ea594d0cfef2a0fa5a3786e4e4de3709df5e493aae56263548206ebd82296e15fb807e403595022 SHA512 d249b966de131fb538bccbdf9ff10501b54058de809a9c8e4405e79aacaa3c232c429183a57b955bd044207ff84a8056883eec3dad1583c6fd58c06ee912bd77
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
index d22ebfa6bb27..0b766606e53e 100644
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
index 07190dfdcdcc..66fb90b3a5a2 100644
--- a/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 265103b087ec..6b7c215c9d51 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -5,7 +5,7 @@ DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
 EBUILD libdrm-2.4.88.ebuild 2039 BLAKE2B a7484a4d636199aab21579b20951cd01be4bd9fe16d3299cb6304b3dadff5225e180e167b606c29acc67c8788e556bb47173cd7a5c599d68e0b74ab34c911444 SHA512 0627dc93340ae2f50cb1c89d345364a947203c8d4d200a9bc507ed95829959fe9aa54b2a946f47028b4c8fd1b81aa6ede031ed79afbffaa4baf48432f3e49cc8
-EBUILD libdrm-2.4.89.ebuild 2047 BLAKE2B 9c62d4dcf5fb6199e9d67b995e865de819ba7e11aa68ac6703a6a555894cf4c8f1472b9adbdf0b72c3a10eb6d15f62d246d11d0dd96ee7ee4be0b1525bfc19ba SHA512 fdb4c5690eafc65b77c8a352eabcaff208a3e0258f762b075920c3059d5df863e4de764d6050adadd80d958d8cee15c3586dc50c6a57ce854ad84c4ed44d88e3
+EBUILD libdrm-2.4.89.ebuild 2043 BLAKE2B bbffc7512beb1114ca469aea5a2c524b234b939a01f8a328a66ad180f74de825eebbe290d00aec4615971e6fe753ae8780b4188f9c06e9d03b7cefa7a2033f2e SHA512 9c18aeb619a876ff81269df1db87a5afe279f5d2eeb68dde64e4831e261a37a87d50db710e3909ffdcbd27b0a5a7935e9ca23a6f1f138003a21802ccf64ac480
 EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.91.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
 EBUILD libdrm-9999.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index 04f61bbb0beb..f89932d40039 100644
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index f8cf0d68b88b..7c6d31df250a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -3,5 +3,5 @@ DIST QScintilla_gpl-2.10.2.tar.gz 2665138 BLAKE2B 1c6349ea717997681e678cdfa6cc59
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 EBUILD qscintilla-2.10.1.ebuild 2392 BLAKE2B 8949f6e08aa13e41ec7ba1d8a0a2d029b3601c8cdb3c71e44a34a728cc05a923b5162c2f657df06bc564bd4042760f1229409f2e9e8420441731e769251e1522 SHA512 c53488e751beb5a52dfc6e9903442f436e976f26afaa4a765e9bada3d0621fec6acecf4df5c98e7434f206f04336b21f0a07dccb09372cd8a693ac6c0930ebec
 EBUILD qscintilla-2.10.2.ebuild 2396 BLAKE2B 28f458ac59aa6a8fe3dea42ad42e4fb0e85d0f385c72c6afc8e67c64e95ae18c65b0b92b9498a8d7fd6808b430fbf74c82eb7e2e2dfaf962fc4d2f48f996b540 SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8
-EBUILD qscintilla-2.10.3.ebuild 1795 BLAKE2B 36847c597a849c37bfdb2d4cd9d230dfdef8acd08b75a7acfb1f0508edc3742e705c0db20e9a867102ecd4858f3dccafd253e5ccef9c8e5b6028c1ccba571cae SHA512 934d5063e87b917059e3d49b01230f57b00b7272310bf1ee55c12a9962a76f274e877ab5e6362e47466729d3f832fa4435ab35f0c5a20cdba7760acef270ba64
+EBUILD qscintilla-2.10.3.ebuild 1794 BLAKE2B 7534837d23437f19694a0680a848d63efa32410a7364ba95299ba67ac7fb7c5225bf9a7daba18d7d82f83225930954b7247be5b87d5f164da255de5382b4c256 SHA512 d534b0cb763f4e6d33691566af4e6db5e9da051951a5706b05105350a9ffb46a4c0532f3ef8644c4f303dc219b1c74999ce77c6f62ae2184452eebd4b757d4d6
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
index 1b74d6e22141..b921763859ec 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="designer doc"
 
 DEPEND="
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 9dc07a37ef30..e22ed87bec57 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -3,5 +3,5 @@ DIST xapps-1.0.3.tar.gz 121490 BLAKE2B e3a5b81cdce5938da0829d16726df3f33e2908924
 DIST xapps-1.0.4.tar.gz 129497 BLAKE2B d668ff840fa83b4a037c4b0f1c502e1851236d7998c4e5c7161a779e170eee6f6f47a2a17e71f332edf3f42f6ccb88c20379ad3b12847277f5e57a3b3765f2ef SHA512 1b735167f8edf15be1093255691c67ee1ae99664a714b75d46b1b782b00a6d1da72befc484ee66f070a829b6b8fd4dfa50bec5033220f66a1a4b577363b673b7
 EBUILD xapps-1.0.2-r1.ebuild 1102 BLAKE2B b217f0b1eb77c992fa84f830a1754daab0ff2831e449b7963d118fa38aceed79b0edf95835487b63ddd7bb01e3bedd1962943cdb20c804ed74c11b013fda63a0 SHA512 a2e535740527a0063a1df101c89b4588af6ec7eab08e88796436dd1d91462bcb8ab2dd61dfb6b69afd9b0cda25318c6d7feedb04263b312f9e957a87c037c9a3
 EBUILD xapps-1.0.3.ebuild 1188 BLAKE2B 3a1c341688c759e9e6bb275eee36140ba29cfdc175f45775c819ca31a6b487a51bc872d0c21644bad369f53af2a2f634db352dbf71aa4461942d7529e282d38d SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7
-EBUILD xapps-1.0.4.ebuild 1188 BLAKE2B 3a1c341688c759e9e6bb275eee36140ba29cfdc175f45775c819ca31a6b487a51bc872d0c21644bad369f53af2a2f634db352dbf71aa4461942d7529e282d38d SHA512 51c355fb4fd5fdb102c974036a5f14ef634492c07f0a5f2515e328631e5f46b8d7fd00b6ceab8735f94cdef176f2c3bb44753c5398fe3dfdc4039eba293b25f7
+EBUILD xapps-1.0.4.ebuild 1187 BLAKE2B ccce8e87cf2d88ee55c17b55014f2b8be7c08adb3d5e814dbe50f02ea7d98b0e53cf7ba0b21966f35a428043af074a4f057f823ba8eedefbb7d6dfe97f448c21 SHA512 b0d601a6cad2e9dfeb94b617c81aa88dae43a2138593d81692ce40266ecaba71952cbdf6c7b9245b7a839ff58d1bc1911c0c6674e706ec0362726ff1377dcec6
 MISC metadata.xml 332 BLAKE2B 63c6409ca74c859140b77f0075049a181a636bf7179d4d6f5ca508740ae75009d9dcd4472e33bde6c66033400670f5a730ffc975d30d798a865c6e1228686892 SHA512 fe3c09b76536049881c6c9de9c0ebe702a7fc29400649eb5f4b7d26a4642a08ff07bb69bb4020aa552c594ee5942bbf5e6c2df9a7754f485a97c5f5bfd6d8aa2
diff --git a/x11-libs/xapps/xapps-1.0.4.ebuild b/x11-libs/xapps/xapps-1.0.4.ebuild
index c72b5f1df5d4..395c05a67e1e 100644
--- a/x11-libs/xapps/xapps-1.0.4.ebuild
+++ b/x11-libs/xapps/xapps-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/linuxmint/xapps/"
 LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 SLOT="0"
 IUSE="introspection static-libs"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d741d120d190..d2108145118f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
index 1f966d8172a2..ba65e2a51b82 100644
--- a/x11-misc/magick-rotation/Manifest
+++ b/x11-misc/magick-rotation/Manifest
@@ -1,3 +1,3 @@
 DIST magick-rotation-1.6.2.tar.bz2 103389 BLAKE2B 9ff85d53d33b381b79fdcb725a663001e583fce46ba36efab561d16f6dcdd50fec7c9d54c1ad9284eae590c2c589622259a5814ffd295a02e6458994ff588c96 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f
 EBUILD magick-rotation-1.6.2-r2.ebuild 2424 BLAKE2B a3a0d1db2df01840eb62a30e605e430229b45cb0260adb1e353ed35b5ae31f2fd996163ec55ff4dfd30a8bbe697ada641a3a502c8ff6babf60f2532d2f89ac38 SHA512 22187c36505f55c33d1e2cef0ea78b601c64b221fb4fc68988f96bc92457c7ca4b1fd17dc1d011000b67e2fb464f5cf3f2c5b94b3131f4830c9c573faa6f910e
-MISC metadata.xml 552 BLAKE2B 12b805115a70b0994af4076bc2a36c8441b89fc8b4f5fc89b35743610456e7a6213e0c3fb79eec3523482598abd025f37360d2b69344f498b98b90c12fa8b4b6 SHA512 4f655a208ca5e8ddd857abb077e91f506faa7445fc0e5d6156fa0b2a5a0dabf880a0355280282a1de2df85fba3ae71b47795790db9949536c66263a6346fe6c5
+MISC metadata.xml 444 BLAKE2B 9a22f781b09c79acfa976b54f3aeae01bbc6617fba6c95f6c859e60d3af720651c8a17b89de9c3c6a55b6c35b0d5e5639149818bf0b58910c1174e3f9904838e SHA512 8a6601959b4a32d8e8391d5696edb61bf3457a62ca5a47e25880319963e01b418c28f4994ebbe3864eaa8343cb7c6bc6544b6db1b5777b43c1ecc8dabf87864f
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
index 1229d82cefa6..081d53a12fb9 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -5,10 +5,6 @@
 		<email>evadim@evadim.ru</email>
 		<name>Vadim Efimov</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 87876481cad2..977d68de7c89 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
-DIST menulibre-2.1.4.tar.gz 414546 BLAKE2B 4c6420e6559415dd4be6aee37af43f820f85bb5d98ce4c3b475d977c1511d4ad30f1fb3db8aff94569a3dc0afa4d75887bed8247cd8d48c673bcb106cfa11b52 SHA512 48322d7187d77a63253ee5d8d269b473e36bab4d02f1442b8e4c66070d372e3eba4247b923932688640092e16d51ea41bef42571694980099c279a3526b9e56a
 DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
+DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
 EBUILD menulibre-2.1.3.ebuild 1726 BLAKE2B 25f6a035bb3a32ff4ec22a6c0147c0b4c6e23501d030a5620a9068f223d17d34f70a09b3b27fe68dbd9ada6a2183d0c57aac7261c065ac033ba1ca0d61cc50d6 SHA512 35b0a13f101aa205ce6fce26f345b46d5fae1131e4bce61caf8630bbc1109f7e4e353da300e83b921c5edf33421b9f6d3951de38bf6c38baeb3e546eb14551cb
-EBUILD menulibre-2.1.4.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
 EBUILD menulibre-2.1.5.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
+EBUILD menulibre-2.2.0.ebuild 1752 BLAKE2B 18cb81a49f89bc0f4565f5410c873a2755c816ae8f016ef8569c8237e6a22d54d46880ad15b068b5f6eea77631267ff7ea9ed3a8c35253c461cc7ae600ab66cd SHA512 dcbf585bd50f0f83db8d3aa0c3f8051fa757335acbf32809b88de1184bfca06744f965a5d231dd22b43818fcd4790cf299f34342aff36cdc0b6889ec4d722f59
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.4.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
index f05ba92dfc02..b66386de4eb4 100644
--- a/x11-misc/menulibre/menulibre-2.1.4.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.0.ebuild
@@ -35,6 +35,7 @@ python_prepare_all() {
 	# too many categories
 	sed -i \
 		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		-e '/^OnlyShowIn/d' \
 		menulibre.desktop.in || die
 
 	local i
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 23a6af119d85..117f72d816bb 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,3 +1,3 @@
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.9.ebuild 1472 BLAKE2B 8c6ab7f9d7e776e6ba3db6afded29906ca3fbbac555a0807cc5a9bbc8742db1bddf09fdc91ff1a865589cf931cbffcee8a41f0b4c41d79095d0b92cf00acf16c SHA512 54a8e5dae7e3324b1d116c62c7f5a6c1bd9918296fe905fc4c4c5fed68e26b61d5b63f74ccb7a08431208e38efa75ff01edc5779777d865f3ce12abe4118569d
+EBUILD shared-mime-info-1.9.ebuild 1471 BLAKE2B 56a16d41ea79d6205fc12f4267192f0d6139c3e43de5ede74bf154577d217baa687c3eed46201bbbb61b58a6a44fcddc484bbf48fdcdd1d1b134c9a7c52ae89b SHA512 4cad2957b70ba474ff6986ac4e9dfad8752f1acebd103df29825174e2c8152032b3c6ce84b94187816e2c4765657f396ca1da6c906452225358e856e8c612878
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
index 71d4fed745fa..4d7eae0ed5e1 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 57acd0b53155..8a83c149e8cc 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index c2d077227f10..f1945f193dcf 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,6 +1,8 @@
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
+DIST enigmail-2.0.1.tar.gz 2527950 BLAKE2B 4abb734b23cd6ae2be149d017d3ccc36881b7cc82e3551ca5506cb25f22c1023f7329a4d7e1139b9e1a4e2eed5f3b12e444e0e88801dfd4aff547d5f6bc7bab3 SHA512 1795e7e15d8388990fbe1c8aed1747e190c319e8d30dc8d08110714f3fa64dd86aadddcfc1d0644e1f1f915396fe85237e976796a7089b24b7644cc049f8ac80
 DIST enigmail-2.0.tar.gz 2526788 BLAKE2B ee41681bba5874b0e8dac5362f49304101567a8dd5da4a8d31c7db353ca61adbe09a5e622a1d69e77a61e82f060266a8644a8c05a241a0f332e4955aed72fff0 SHA512 bbf7c743d51d6010e8dcca575e1530561944b552dd940119cda874c4b70109eedaaee437c108b1ead17a8414935f48083e2bde8020f3504f927bf9e01fb7b4ae
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
+EBUILD enigmail-2.0.1.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-2.0.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.1.ebuild b/x11-plugins/enigmail/enigmail-2.0.1.ebuild
new file mode 100644
index 000000000000..9e8d0cbb3958
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+	S="${WORKDIR}/${P}"
+else
+	if [[ ${PV} = *_beta* ]] ; then
+		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+	else
+		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	fi
+	S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+src_compile() {
+	emake ipc public ui package lang stdlib
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/pidgin-xmpp-receipts/Manifest b/x11-plugins/pidgin-xmpp-receipts/Manifest
index 3c02b6d14678..377a93ec052a 100644
--- a/x11-plugins/pidgin-xmpp-receipts/Manifest
+++ b/x11-plugins/pidgin-xmpp-receipts/Manifest
@@ -1,5 +1,3 @@
-DIST pidgin-xmpp-receipts-0.6.tar.gz 15946 BLAKE2B e611f2eb5a69db9447f0e14188b624a37d85a24f5e2abdbafe280f3d22b69197daa1bd29dd960317a7d35c0aef8bd03de03d4c542b3191b33cd534b35d23b61b SHA512 160270206d0d6394bddaa15ca59896756ab3a546f7c74cc9e3d4ec634f70b829ae3b013ee6086a5d4a5376b7d2b81341c44c3ef0ecab2a66d612b96fd37dfeff
 DIST pidgin-xmpp-receipts-0.8.tar.gz 16021 BLAKE2B ba6eb7cb49ec75981e2c15f8aa471e6169ca4f9e6b03061248ff99669b7e31c838c466b1b476fed20bf3c1321954de13b053bbdd599f1ac4f58defacebabf383 SHA512 04113236d46066211d7e0f3c66f4bf1b6fb8a33ac675203f3cff15300eb97ffd3ee627e03fcc3ab3d1e9431fc107a9f7e9fca319f3debb773603d311b167b5a8
-EBUILD pidgin-xmpp-receipts-0.6.ebuild 925 BLAKE2B 81d54cc3df2c5f0e99f0e4a79a37b741ce43aa85046e9a82f567b347e586913608af2e2dadd93a2bf74428a08939711e1debad8f97a9d5b6bd54ceb28ffebfc5 SHA512 1c997e27d85d4f97b65b31efdfd9e9667fc5ef6645214fc445c2760f5ce3222979f1f95e0db7d62702842b4d050c04df5447443c2a9cad78400a32af816a7072
 EBUILD pidgin-xmpp-receipts-0.8.ebuild 886 BLAKE2B 0c3225f3ea6febf81693970007271c84a1ab8712f384aa5d125d000af7a6d43ca5b56c29ffadf0b757d8c6603ddacc47c67e4d4df9b200d0e6fe5470249bd652 SHA512 e263e4dd770d7b4605837d59bc8f909127ce1c1fdd3e5d123cb9ca0cfa277ab4ab0877c8b8f9e1b39cdb43373b89259b9fae5f5a896c86066c4819e06554b4c5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild
deleted file mode 100644
index 1d538ae464f0..000000000000
--- a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin"
-HOMEPAGE="https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents"
-SRC_URI="https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents/ckA6jCV5Kr4OkjacwqjQXA/download/ckA6jCV5Kr4OkjacwqjQXA -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	GTK_PIDGIN_INCLUDES=$(pkg-config --cflags gtk+-2.0 pidgin)
-	$(tc-getCC) ${LDFLAGS} -shared ${CFLAGS} -fpic ${GTK_PIDGIN_INCLUDES} -o ${PN/pidgin-/}.so ${PN/pidgin-/}.c || die
-}
-
-src_install() {
-	PLUGIN_DIR_PIDGIN=$(pkg-config --variable=plugindir pidgin)
-	dodir "${PLUGIN_DIR_PIDGIN}"
-	insinto "${PLUGIN_DIR_PIDGIN}"
-	doins ${PN/pidgin-/}.so
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ecf86632101d..a491f2061b0d 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/clearlooks-phenix/Manifest b/x11-themes/clearlooks-phenix/Manifest
index f700fc6a910f..634c855196e9 100644
--- a/x11-themes/clearlooks-phenix/Manifest
+++ b/x11-themes/clearlooks-phenix/Manifest
@@ -9,4 +9,4 @@ EBUILD clearlooks-phenix-5.0.7.ebuild 556 BLAKE2B be1fead491baa2ddb3a1264b54fd87
 EBUILD clearlooks-phenix-6.0.3.ebuild 556 BLAKE2B db739774feed4239996910d2acf1be1596bfe9edddd2ee7e542f6455687507ff177b09d51c3ff8bb2ae62ccb5c4ede7697980b5cbc0d6465daf8ae1f4f5f4b4b SHA512 4bd3a12087d4d172e5cba27150cf3e58e1fb257f69e0002782bda25e2e3c8a10c6f6848c9e538df6c654f3b67706fbeb9d5b4df5537c079097b992a503d9727b
 EBUILD clearlooks-phenix-7.0.1.ebuild 556 BLAKE2B d1955ba539f20e31d4be92ab98990e31bd731e85a9ba2032760a5021781b274e68cd189a592ddd81bace087a9966d3132ad0c8b4090cc9beb620e7a813a253a1 SHA512 0708a215f91bbe7889e84961c8f50bb05230c03acf48e17128c67826b685c11c034087206c6166d0270891f72d2da5eef0f2a5a24a6a18d16076ae757aaf5c47
 EBUILD clearlooks-phenix-9999.ebuild 609 BLAKE2B 8f6d8d3bbea834ab25304bee526953119af957e74998ec8e47500b1697e1b81f77fca1ca8de26f39c82e3bedba5361c9b5eac006ca6fe70ed09557c5a3282d49 SHA512 4aab6a4ea22222c1ac3778d9607f03bd15b47d1352f107ac9dd317d41b8e89a992f2d2fc14f024afff00883f84567caa1f1023300313ce0c7a6008fc8cadcb06
-MISC metadata.xml 459 BLAKE2B 44fe255e596135c50c2a3b8931cda3611dfcaf71b84521bb1c074e27be253d9e02d664e6e8d058e89e998afae2ed6badc4dc826e97e8a120ee4c62b199c73559 SHA512 f84b1d8df41cf68e1d2f8cdf0dd0e479f904f4404b55ab9086faef1aa6e6137cae769021722bd7b1673f5cb0568df04fedef018c3d36f4b0e9ab845fe8439572
+MISC metadata.xml 257 BLAKE2B 2ed20562a7d6d8df5e260b1da8a283a3674221a2b92ddf9215ef942b46b02e6a0075463f9d1b4783738ff9ea5b720b6de21fa5f116f9deae6973debed454dad8 SHA512 90da36260a95c749fc919bcea0eb97829f8fa40300a642e7cc77ef84fbfdf00cacc4298bdeaad30a470f00bc93ae91fdaec104a54f6d875e103a765a134d53c4
diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index e99e088e56cf..70074d9c4da4 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>brakarov@outlook.com</email>
-		<name>Geert Braekmans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jpfleury/clearlooks-phenix</remote-id>
 	</upstream>
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/Manifest b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
index 2218dc24875e..4a04024d5a78 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-aa-xcursors/Manifest
@@ -1,5 +1,5 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
 DIST vanilla-dmz-aa-0.4.tar.bz2 159309 BLAKE2B 20ad256d31d101954ba7b41c52624da02e11a52072815a4c13e92787bf930e9fdd17eb8c96af371ee69f254204f225698f571f8459aa85701ff29bc053a7c6b6 SHA512 08a4a0d7e685d77c79b3f917b60cf7e6572bd9828b8314a335727baf8e51d7cf175c6a800ffa2761c5ccea275411e8552c56b39c7ed092effde8ecec784cf446
-EBUILD vanilla-dmz-aa-xcursors-0.4.5.ebuild 698 BLAKE2B b53b3f9fe0094f0664f1c86a1f2740cee25646fc15b9b00d71ec669c53be61631cfcbe84c1f3d44cccd0f6bcdb73282a95346ed268c893bac082493a6dcb8898 SHA512 0412bd2473796b3beea8b31aad4dd83bdf816fd58011a719a187806b41e4897d736f87629b4a67418542d05a6c41fbec55256b7568e84a9177d88927f1cb6725
+EBUILD vanilla-dmz-aa-xcursors-0.4.5.ebuild 697 BLAKE2B 1eb2113a42a61de4b2d205655f24cca660cb9b803879dcc8f10d500a944b43705367c8f7d81e9076637f3d8f89c5edb773fe8739f7da3f7218285ef718e32f53 SHA512 a9e92329e66685b454c5f9afe5eb9aebc1c3641f4a5d0491dad86d2c98ea75f352f72247884b9d8ef921fc28aa92c659bf9135a8860d1af26041c94829863f74
 EBUILD vanilla-dmz-aa-xcursors-0.4.ebuild 1252 BLAKE2B f0c8d2b2a7d6869df2e1fa9a8549f337fccbb07185fbfcfb312fbdba02b43e4be84cab6a94ae0bd91c3eb22810b8b71ad1fa02577199f23e41e18b8b529216ac SHA512 2edf941d2e51ef19b19b6755465c3a371f9533987af312aaa31be726e77361deeec2bf52b9a3c4f2b5232313d79bd5c4b751ad29d3387ba726f313d6520cec54
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
index 4eb9640c5ee5..8791b0ec8a19 100644
--- a/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
+++ b/x11-themes/vanilla-dmz-aa-xcursors/vanilla-dmz-aa-xcursors-0.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/xcursorgen"
diff --git a/x11-themes/vanilla-dmz-xcursors/Manifest b/x11-themes/vanilla-dmz-xcursors/Manifest
index 8204ca260d48..b8f7877effe2 100644
--- a/x11-themes/vanilla-dmz-xcursors/Manifest
+++ b/x11-themes/vanilla-dmz-xcursors/Manifest
@@ -1,5 +1,5 @@
 DIST dmz-cursor-theme_0.4.5.tar.xz 947544 BLAKE2B 6c945575f57c3db87a95545ef023a4a7d8cc6a329c5a083d0501452e34c9603568cfe41e495bae4d2982d01641dbcd4deef39e0291d6aa12e4d7a35c47e4797c SHA512 627fff9e4f690e30c6acbedb06035abc3ca7f6c6656a7e1290d752e115dbd8a41c37a2fe0d7cd7ece697c54dd7a343dd78d3c4604d124158961d95125f899f73
 DIST vanilla-dmz-0.4.tar.bz2 135099 BLAKE2B 85d52af28493e801dbcd0d7480461a4075796322d6c48986c9dc3dd99e364f4961e3f3737bd0bbf8e4bc499a19c76e8d954992872fff522b6174d53d96e66661 SHA512 1e234033b683c1c13cc53a7a48f4ed41a53e22a622b4dd6e2a8c1b2f026f974ad608f91400ea4c43906b96e3d4f1ad4b13dabf3f9f156b27a7137aa561620bce
-EBUILD vanilla-dmz-xcursors-0.4.5.ebuild 692 BLAKE2B 264afb5b58e544d05a18010f10787078d1dfe363b0a15c875ade393d9eb9940a513a9569c33e3330409713ad902c10f1939cd439455afa8e6c1dbf05684be33b SHA512 57362a983d13929322a482e0e9cc4816a58bff63b7b1e7422ad4f38858ee400c3e8b895c4383f040231c5c15a802c6484da072fc5731bdccd33d98658557f424
+EBUILD vanilla-dmz-xcursors-0.4.5.ebuild 691 BLAKE2B bd1b9373f6e9f052cabc07465300ac4392228f3be057becb6bd838031024fa4c1e5fb7413226314cd1bf08297659762ec72031228061de3121ca73965f84b316 SHA512 a7f8460cbf8b6a5e2785cbace0da2a4773f2adbe7eaf1c936cb5fbe1690dafdb7b9c9ee44c8806882568363767bc16dc85cbb8b0e268de6cf69a2297f6d1d7d6
 EBUILD vanilla-dmz-xcursors-0.4.ebuild 1247 BLAKE2B ee42792d8286e4101dec4f97126334ab1082e1b45a6f5db38c9dc68c90a682bfd1b5a2bfd5c7f9ee9b8eab7158558acd15ee55e2bb297ede14e37a225b934120 SHA512 cb23a21dc96696b3f583fe6f1a9eb06d02d32a58095780132bf7682f3688b9df6e17434192a477290c9fcc906d7b0502ae9f2ffa2b240e067ef06d19195619c2
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
index ffc17ebc5271..adc45120dffc 100644
--- a/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
+++ b/x11-themes/vanilla-dmz-xcursors/vanilla-dmz-xcursors-0.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${PV}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x11-apps/xcursorgen"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index eae4a13b497f..8e58cdb82a53 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 091062b12b73..b2257d91d454 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,9 +1,7 @@
 DIST ctwm-3.7.tar.gz 1139461 BLAKE2B 7c96f6434dea660dcbcc017b89bb9df533b6b26688392ba7baf14b4b701d093f8ff4e0c0c3af61bd5ea32d0b88b336d6958e1d4f524de1cb4d4577e20cfe3380 SHA512 e3c1e4bed68ffbf3efbc6057743889d706ed16e74bd334ebb689c8283f1288778dc368f0a6064aa7e24a6416592f22d1eeffc09c76cb0cd4ea64467718c62cfd
 DIST ctwm-3.8.2.tar.xz 549984 BLAKE2B 90b1d7c872e2ca8960853829d9ad5b19476ca8cdbcda9d3fcb180787aa85ff13b3d63e6c6d19e38193d71c2175c939d65d9581ce2629314c78dc0a56bf8cb139 SHA512 4633b7bf7b8528ecfd2a753f443fd5286fd394df37ebe885138d30a498f0d721076835d135974a2bd11ca9c32ffd288f84788cb0407ae346a29c5f6371dca497
-DIST ctwm-3.8a.tar.gz 738226 BLAKE2B edab8f95dc6ec4dbd41e70552682858217bd4ba98f3b9a16a73d661dd0a92850eafd63f161d52c2f5034c11fe3df9ceb7ecf9baf7962782b7b0ca9f2152ef6fc SHA512 df850358ece699af7922c7b0c8a39694d9b1cb835a653665ab826ac9a159bb959ed502c65997b79beaa06542b017e19e3916bdf3c45f71a85f2168bc576de5be
 DIST ctwm-4.0.1.tar.xz 656776 BLAKE2B 37d6011d04f8d64552a86608a4d3867e6e1b0135f45457886daee6be1ae23ca1e3079caa1a63befd1d17bcc640e40ba0f1ed92e0a0caf2c6182f6e282f012bf7 SHA512 8c5c0bf868ba36cf5acca1ac5dbcea9327f63892698ace5086fabe563632acbb578cefea44ac3de91dc15afdbdce0370169e14156525507b90dc8aca8d305bc6
 EBUILD ctwm-3.7.ebuild 1204 BLAKE2B df5d9427f1e4cb93a9c4a4da67b3b03917eda654fd8a323cc86ea78084fa3b233e93517862443522eb1ea56b5b402a535d31778c2c2a52f6447bf651fde35af2 SHA512 23b3edac816e083fc4ff5d640119ba7ee6a8c07b3b601e38a61f0fcd147d0963b75f5329736ab606ebae1b80ed7b6c5e47225af79ae396980d4636ee605ac037
 EBUILD ctwm-3.8.2.ebuild 1546 BLAKE2B 037631059eb8ef42eb50d70359574a57e23c17f1a4fe40a2fb1327a50b0c5e6a4c596cdb0da73136958dac726b6c5bc2d20d2c524f0791c76e24b0f33089051d SHA512 4bdc01a3290cc7293d9c38acbb0c2d6dad77b18d6b57c0b72844fe304c42bb5025af98d7e7ce49187079c4f6ec45d3175f12b7b0921ef73bfebe61057fca00d1
-EBUILD ctwm-3.8a-r1.ebuild 1508 BLAKE2B ac129025c5340624d0ac94baafb35c5ca00b31ead6d973bff9186cfe9431bb071863156e32cb7ce6b1f5d5e1de95d28c25849d26e89f924b681c43d2b1e100fe SHA512 6ff601ccb3e26e83ea3267c066e075445e6974a6111147b9457188e2b0cf78c7087b98a6ab99b8bf48d65785bc80330341ba20b75a62d7ff817e2e116cce067c
 EBUILD ctwm-4.0.1.ebuild 900 BLAKE2B 3f3c744060c15fd226d657d87ee8ca0d85a68d044526a59894aa72ad7cb56b8d455e61500e3ecfbfbe1abfb24beedd886f23992843c515380d8d787704f622fc SHA512 6d49ea92d4490956bc9b6d5ecb1afe6e6097b44b04cecfb844160fb802ce855b381ba9a93430eb9ac2d099a42ac6fb2b9d5e95e907168a63c5c4d31967738c91
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/ctwm/ctwm-3.8a-r1.ebuild b/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
deleted file mode 100644
index 974916539b90..000000000000
--- a/x11-wm/ctwm/ctwm-3.8a-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A clean, light window manager"
-HOMEPAGE="http://ctwm.free.lp.se/"
-SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	app-text/rman
-	virtual/jpeg
-	x11-misc/imake
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-src_prepare() {
-	sed -e "/char modStr/ s/5/6/" -i menus.c || die #overflow bug 338180
-	sed -e "/<stdio.h>/ a#include <ctype.h>" -i parse.c || die #implicit 'isspace'
-	sed -i Imakefile \
-		-e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" \
-		|| die
-
-	cp Imakefile.local-template Imakefile.local
-
-	# TODO: Add GNOME support
-	sed -i Imakefile.local \
-		-e '/^#define GNOME/d' \
-		|| die
-}
-
-src_compile() {
-	xmkmf || die
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		TWMDIR=/usr/share/${PN} \
-		|| die
-}
-
-src_install() {
-	make BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		TWMDIR=/usr/share/${PN} \
-		DESTDIR="${D}" install || die
-
-	make MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR="${D}" install.man || die
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/ctwm || die
-
-	dodoc CHANGES README* TODO* PROBLEMS || die
-	dodoc *.ctwmrc* || die
-}
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index ace393f24d7f..88fdaccde6e7 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -10,5 +10,5 @@ EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975d
 EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
 EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.6.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
+EBUILD muffin-3.6.0.ebuild 2073 BLAKE2B fc1aed8f1f401196abd8f8bc8ea3cfda0bd1abae9f75e10f1065648c3a3e77001441161f6aa2e2c92236e14aef35e43895ac7c565bfaf2df6d5bfdd03070bbd7 SHA512 fe8fd5ffd715adcaecd5facb3e8b34736d93c364a518c4ee03044e318c97b984b2916f2153d57cc587f1515de2120856c9416f37516ff1c0cf6ce5233b7a2b30
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 54cfd8ecf95d..86439be98daf 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 COMMON_DEPEND="
 	>=x11-libs/pango-1.2[X,introspection?]
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index c9b36f40c98b..ca78d70ebf8f 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index c13266d78238..bc2ef8bc1fd8 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,8 +1,12 @@
 AUX thunar-1.16.2-integer-overflow.patch 1160 BLAKE2B 0b82756541c9106d86eac0e45b54adc27d229c590c607d5b9c12dd78eb1bc8afc0446e2a9054e8e7704ab16bb006eb4d6f731c62b46bcd821f151bb2f6506b6e SHA512 eaefb709e03902cc97be41d4c670ded910234fd1536aae8597cbd9224e0d61badfee912eba81ee2e1a6c308ccd12b26961634e24b8b64fc8457b9d31ba57a843
 DIST Thunar-1.6.13.tar.bz2 1937341 BLAKE2B fc47188876e694f724e3f10a0c1e621b5cae4112c9cf4951e670cb56d30ab532b04e77a29fca79096b58aac260ae8a065a6b0caf72c8b4750944dea593be9f2f SHA512 d1ae8efd0652c21b14ff45be9eef2ccf6b4400c744b08b2096a47b1af4eade2df1a237d03ede3e5dccea018b626dd67ffda2ed946b31fc2d3ff214c79e30168f
 DIST Thunar-1.6.14.tar.bz2 1964822 BLAKE2B f080f3d0634b4b4a8e11cdb902d5f300b1829979a98b573bdb6fd11b273cdc5e37f8e8c03556561b9f8730a70c7f7c34cbfbda76fe90f86cf2c443c3f426aabe SHA512 63287e35e71a6d1cb75a4d4db4d05f0fdf34d43b0ce7a2094e6aa9042d16f3eb60f7c5d755810bb0807112177e37954ba566b4f0ef701766205ed9e5561bd6e1
+DIST Thunar-1.6.15.tar.bz2 1964447 BLAKE2B 07dd4241f5aad975ae8f3c4cffb1b40338fd31f5434fb436a2772a9671673b4b124ac4363dd7c1267b0b51d42550735bbb733ada16f77a5b89176a353c84edbc SHA512 836d2d10347915b2e03be5501806e358af1c60786284c5e5afa11a6a79bc6a790966ea43bd9add6783fab91b08f06ae7852c21152f3aa0f29814325a16d65a7f
 DIST Thunar-1.7.1.tar.bz2 2264496 BLAKE2B 84fc0ae18ec4d4bd414bbce30b6ba7f1f0c90de6202d8b830335fb49561c85428ee13753bdc1cb810713e628b977aacf78c93d7bd88c9ac90e3a78f8d74f5737 SHA512 200d2f7a30529fa9a93340a24d019a883193952157f3b37e67d4618ccff95823dfa06f6b04845d185fcb5ead780ea5c69ba9b846c82ea22bc433321b2b160ffb
+DIST Thunar-1.7.2.tar.bz2 2236176 BLAKE2B e7ebcd8b74295539edfeed710cc25204691af3eaa1c84dcd9b56399f5af2220aabc9ce2736f03c7c1bfe9a61600c6acc4f659ba8d56e575f0e4679a644f1c459 SHA512 b98b72558c9a8872f89632820be816f2c2e7f7e07750cc62eace741794cde4aa4daf2f4ed7fd52a5b1e3c4e9965925a038a948124d32ed6d392db65b8780ccdb
 EBUILD thunar-1.6.13.ebuild 2023 BLAKE2B 44188d0301976e69b8889e67498199a66c7d5088165be529790b05811a54928442067a4c4b778415a8443a9a4c9945d4a9fa356f06484af35f412183c049964c SHA512 55c8db9c7651b7a72f3a58ce02fef6a91f3ffdd4266e1f4b84e3849c77f2d9bd8d1e421493926d3206d621f82285c56355bc423fb130eb4d049491ad2a74541a
 EBUILD thunar-1.6.14.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
+EBUILD thunar-1.6.15.ebuild 1966 BLAKE2B 26b9fc6171eed41563721f89aa5255b9b7aa8802a9d95270ab35bdeabb8baf12ba524e91816d363d94f1ac2b4fdd39ebb80c45bd9cac97aaff6e30d92518430f SHA512 0f858769d7f8f05cd8cf2d1c92aa3f9d52bea3e600cd5da764383a98d05ced3b33a5eac868bc37ad5b70400a3160555973f0c4981a7d000f2c88591f576acde1
 EBUILD thunar-1.7.1.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
+EBUILD thunar-1.7.2.ebuild 1993 BLAKE2B ab5c787b9798f19b683709d2d17818cd40b28c165497121d0f8d778be45c45fc3d13ef97ffa7394530eba9b75156ac4d24b6028b816c54c606bceb4dd25dc6a5 SHA512 6a27b9e39078a223028ebceeb2fbde6e8084d35f4ae6cd51885937787ea98cc3510dc876400ca7c6b98b769ae8e4ec02e89be564153e87e5bbc8e64446781d73
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.6.15.ebuild b/xfce-base/thunar/thunar-1.6.15.ebuild
new file mode 100644
index 000000000000..39633fa570c5
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.6.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils virtualx xdg-utils
+
+MY_P=${P^}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-2.24:2=
+	>=xfce-base/exo-0.10:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10.1:=
+	>=xfce-base/xfconf-4.10:=
+	dbus? ( >=dev-libs/dbus-glib-0.100:= )
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	dbus? ( ${GVFS_DEPEND} )
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="trash-panel-plugin? ( dbus )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable dbus)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/xfce-base/thunar/thunar-1.7.2.ebuild b/xfce-base/thunar/thunar-1.7.2.ebuild
new file mode 100644
index 000000000000..fb1e05deebaf
--- /dev/null
+++ b/xfce-base/thunar/thunar-1.7.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils virtualx xdg-utils
+
+MY_P=${P^}
+
+DESCRIPTION="File manager for the Xfce desktop environment"
+HOMEPAGE="https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="exif introspection libnotify pcre test +trash-panel-plugin udisks"
+
+GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
+COMMON_DEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	>=x11-libs/gdk-pixbuf-2.14:=
+	>=x11-libs/gtk+-3.22:3=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/libxfce4ui-4.12:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/xfconf-4.12:=
+	exif? ( >=media-libs/libexif-0.6.19:= )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	pcre? ( >=dev-libs/libpcre-6:= )
+	trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= )
+	udisks? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/desktop-file-utils-0.20-r1
+	x11-misc/shared-mime-info
+	trash-panel-plugin? ( ${GVFS_DEPEND} )
+	udisks? (
+		virtual/udev
+		${GVFS_DEPEND}[udisks,udev]
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable udisks gudev)
+		$(use_enable libnotify notifications)
+		$(use_enable exif)
+		$(use_enable pcre)
+		$(use_enable trash-panel-plugin tpa-plugin)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-07 13:16:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-07 13:16:39 +0100
commit	e91a1aaa5ec8fab37f0fd082ac6024d41c6651e2 (patch)
tree	ee7587dfd365faadd9b297d595c31368bf94f9ca
parent	2d446203bcf1a0db08e99abca43513d246dfa73d (diff)